815 commits

Author	SHA1	Message	Date
Morb0	e21ee44f9e	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/origin.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json	2023-09-13 16:51:52 +03:00
deltanedas	24810d916b	ninja 2 electric boogaloo (#15534) ... Co-authored-by: deltanedas <@deltanedas:kde.org>	2023-09-10 16:20:27 +10:00
Ubaser	d7c9a2cb73	fix transparency (#19934)	2023-09-09 01:44:35 -06:00
Velcroboy	1de23dc4d0	Adds Ganja Brownies (#19222)	2023-09-06 21:21:14 -04:00
Morb0	b1550d7db0	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png	2023-09-05 00:12:02 +03:00
Fromoriss	b50e5651a1	Add moth plushie (#19828) ... * Add moth plushie Moth plushie. It's cute, don't mind, merge it. * Update toys.yml	2023-09-04 13:18:03 -07:00
/ʊniɹɑː/	b52b063d6f	refactor checkerboard (#18359)	2023-09-03 16:16:09 +10:00
Morb0	5a6058666e	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Server/Chat/Managers/ChatManager.cs # Resources/Textures/Tiles/dark_mono.png # Resources/Textures/Tiles/steel_mono.png # Resources/Textures/Tiles/white_mono.png	2023-08-31 20:55:00 +03:00
Nemanja	4d677f0685	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467) ... Co-authored-by: Kara <lunarautomaton6@gmail.com>	2023-08-30 18:06:15 -07:00
Morb0	2968d856bf	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json	2023-08-30 20:42:46 +03:00
Morb	c99e365ce7	Give nukies the ability to declare war for a TC boost (#19291) ... Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>	2023-08-29 23:56:20 -08:00
Nemanja	f4503864d5	Concrete and asphalt tiles (#19642) ... * concrete and asphalt * los decals	2023-08-29 17:50:11 -05:00
Morb0	6a241fbffd	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-29 19:36:13 +03:00
metalgearsloth	789c5e0a2b	Add fultons (#18958)	2023-08-29 16:34:05 +10:00
Ubaser	7065f6cc02	New bloodpack sprites (#18192) ... * Add bloodpack sprite for testing ingame * shrink * small tweaks * Update bloodpack.png * add sprites * add meta * fix meta again * fix regenerative-mesh idk how i accidentally deleted it * HOPEFULLY FINAL FIX AAA * change copyright * TEST * Revert "TEST" This reverts commit 34de38e2a228d3f28feed966404640cc8b6c788d. * maybe fixed * blue	2023-08-28 22:30:10 -06:00
Morb0	1b513f0c1a	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Zombies/ZombieSystem.Transform.cs # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Textures/Tiles/attributions.yml	2023-08-29 05:58:14 +03:00
Nemanja	595d42659d	Revert "Add peeled state for bananas (#19393)" (#19588) ... Using "spawn item on use" blatantly breaks botany mutations for bananas.	2023-08-28 10:30:16 -08:00
Kara	70e0520a2c	Watchers (#19367)	2023-08-27 16:14:57 +10:00
potato1234_x	77711dea5d	Add peeled state for bananas (#19393) ... Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>	2023-08-26 09:31:13 -07:00
Morb0	5277dceed2	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs	2023-08-24 22:01:46 +03:00
Morb	fd46b2c7ef	[Resprite] Cans (#1365)	2023-08-24 21:22:17 +03:00
lapatison	9341cac5ef	Split gardening cyborg module, literacy cyborg module tweak (#19449) ... * book bag to literacy module, bucket n plant bag to gardening * split gardening into gardening and harvesting * book bag whitelist document, also dumpable * fix * new icon	2023-08-23 20:12:05 -04:00
potato1234_x	149e58d30a	revamp getmore inventory (#19372)	2023-08-23 17:49:25 -04:00
deltanedas	4935a95687	borg construction module (#19260) ... * cant insert materials into machine if unremoveable * lingering materials * add construction cyborg module * fix empty stack color * lathe recipe * a --------- Co-authored-by: deltanedas <@deltanedas:kde.org>	2023-08-23 17:34:39 -04:00
Morb0	81fe87f513	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml # Resources/Prototypes/Maps/saltern.yml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml	2023-08-21 09:44:38 +03:00
chromiumboy	26eb71f1eb	C.H.I.M.P handcannon redesign (#19004) ... * Added basic alternative fire mode system for the CHIMP * Redesign of the CHIMP handcannon - the CHIMP now has an internal rechargable battery (10 shots at 100% charge) - it has three alternative fire modes, one for each particle type, that its user can easily switch between - syndicate scientists have access to an experimental version which can also fire omega particles (4 TC) - each particle type now has a distinct color and damage type: delta (red): heat, epsilon (green): radiation, zeta (yellow): shock, omega (purple): heat + radiation. This affects A.P.E.s as well - CHIMP particles now do 10 damage (up from 5) - all CHIMP particle cartridges have been removed from the game (including the syndicate omega particle ammo pack) * Code revisions * Code revisions - Removed changes to particle damage and damage types - The experimental CHIMP was removed from the syndicate uplink and replaced with an upgrade kit, which when used on a standard CHIMP will convert it to an experimental one * Code revisions - Added a 2 second DoAfter for applying the upgrade kit * Fixed spelling mistake * Update projectiles.yml Removed commented code * Update Content.Server/Weapons/Ranged/Systems/AlternativeFireModesSystem.cs Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Code revisions - Implemented changes requested by EmoGarbage - Removed UpgradeKitComponent in favor of using a construction graph - Renamed AlternativeFireModesComponent.cs to BatteryWeaponFireModesComponent.cs Textures - Reverted omega particle to being a green color - Epsilon particles are now a cyan color * Added comments * Revisions - Moved BatteryWeaponFireModesComponent from Shared to Server - Restricted access to this component to BatteryWeaponFireModesSystem - Changed the CHIMP upgrade kit to a chip - Updated the localization files to reflect this change * Delete interaction-upgrade-kit-component.ftl This file is no longer needed * Update battery_guns.yml Added new description for the experimental CHIMP * Update battery_guns.yml Updated experimental CHIMP description again... * Fixed issue with ItemComponent --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>	2023-08-19 18:54:52 -04:00
Morb0	0b053a65ba	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Server/Chat/Systems/ChatSystem.cs # Resources/Prototypes/Catalog/Fills/Crates/salvage.yml	2023-08-17 06:19:53 +03:00
Tollhouse	8dedabbb8f	Dan's Soaked Smokes (#19150) ... * Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list. * Forgot a png * Smokes work just need sprite work and random * First pass on random cigs * Cigarettes are named now just randomization left * Finished on my end. * Whoops * Nutrient is not availiable for smokes I guess? * Testing fixes * Dunno found this on the filledbookshelf might work here? * I dont know what Im doing wrong but I think this might work. * Trying with orgroups in the pack YAML * It seems to not like the food chems. Commented them out. * THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume. * I have a sneaky suspicion its the size of the container and pool of fill items. * Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent. * Apparently non whole number size is a no go. * Cartons were to small and added maxamount on cigarettes. * Amount: 0 caused odd errors. removed and changed maxamount to 2. * Reworked randomization system to try and use weightedRandom instead of prob in storageFill * Wrong weightedRandom * Rework of a rework. Good on my end. Simplified the randomization to bare minimum. * Added gas station dick pill vibe to all the names.	2023-08-15 18:27:18 -06:00
Velcroboy	75d2c12e65	Add food carts (#19177) ... Co-authored-by: Jeff <velcroboy333@hotmail.com>	2023-08-15 15:26:49 -07:00
Morb0	22283a01f1	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Nuke/NukeSystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Content.Shared/Chat/SharedChatSystem.cs	2023-08-15 00:08:39 +03:00
c4llv07e	d7eb3bfb44	Pipe painter (now with airlock painter) (#19031) ... * Add a pipe painting function to the airlock painter Signed-off-by: c4llv07e <kseandi@gmail.com> * Rename engineer painter to omnipainter Signed-off-by: c4llv07e <kseandi@gmail.com> * review changes Signed-off-by: c4llv07e <kseandi@gmail.com> * fix migration duplicate Signed-off-by: c4llv07e <kseandi@gmail.com> --------- Signed-off-by: c4llv07e <kseandi@gmail.com>	2023-08-14 15:06:21 +03:00
Morb0	83dcb2970d	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/tips.yml	2023-08-14 03:22:26 +03:00
deltanedas	8b1af46a2b	add throwing star (#18700) ... Co-authored-by: deltanedas <@deltanedas:kde.org>	2023-08-14 01:18:48 +10:00
Vladislav Kadira	229df7c5ec	Add cocoa cultivation (#18366) ... * Add cocoa cultivation * fix * Fix 2 * fix 3 Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com> --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>	2023-08-13 10:35:58 -04:00
PixelTK	f189b73fe5	Arachnid rework (#18631) ... * Merge before I fuck up anything again * craft whitelist * Sericulture * Spider * gone * quickly fixed * and coders taketh away * And we take more away * sericulture improvements * arachnid * better webbed * OH WAIT * test fail	2023-08-13 01:38:05 -06:00
brainfood1183	ae5dcbabee	Holoclown (clown only) syndicate uplink item. (#18966) ... * Holoclown (clown only) syndicate uplink item. * added clumsy to holoclown * holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting. * gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop.	2023-08-13 01:18:09 -06:00
TaralGit	8acac895fc	(Re)Adds open bolt animations for gun sprites (#17219) ... Co-authored-by: and_a <and_a@DESKTOP-RJENGIR> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>	2023-08-13 15:58:07 +10:00
RiceMar1244	7de1cedff5	PKA resprite (#19024) ... * Changed all PKA sprites, added wield sprites, modified meta.json * Added animation assets for future yaml'ing. Made changes to existing textures. * meta.json changes * Corrected arsenal.yml missing sprite * Removed unused animation assets. * Put back the one animation asset I was suppose to keep.	2023-08-13 00:50:41 -04:00
Morb0	f5c44e5bd0	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/typing_indicator.yml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Effects/speech.rsi/alien0.png # Resources/Textures/Effects/speech.rsi/alien1.png # Resources/Textures/Effects/speech.rsi/alien2.png # Resources/Textures/Effects/speech.rsi/alienroyal0.png # Resources/Textures/Effects/speech.rsi/alienroyal1.png # Resources/Textures/Effects/speech.rsi/alienroyal2.png # Resources/Textures/Effects/speech.rsi/blob0.png # Resources/Textures/Effects/speech.rsi/blob1.png # Resources/Textures/Effects/speech.rsi/blob2.png # Resources/Textures/Effects/speech.rsi/clock0.png # Resources/Textures/Effects/speech.rsi/clock1.png # Resources/Textures/Effects/speech.rsi/clock2.png # Resources/Textures/Effects/speech.rsi/default0.png # Resources/Textures/Effects/speech.rsi/default1.png # Resources/Textures/Effects/speech.rsi/default2.png # Resources/Textures/Effects/speech.rsi/guardian0.png # Resources/Textures/Effects/speech.rsi/guardian1.png # Resources/Textures/Effects/speech.rsi/guardian2.png # Resources/Textures/Effects/speech.rsi/holo0.png # Resources/Textures/Effects/speech.rsi/holo1.png # Resources/Textures/Effects/speech.rsi/holo2.png # Resources/Textures/Effects/speech.rsi/lawyer0.png # Resources/Textures/Effects/speech.rsi/lawyer1.png # Resources/Textures/Effects/speech.rsi/lawyer2.png # Resources/Textures/Effects/speech.rsi/machine0.png # Resources/Textures/Effects/speech.rsi/machine1.png # Resources/Textures/Effects/speech.rsi/machine2.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Effects/speech.rsi/robot0.png # Resources/Textures/Effects/speech.rsi/robot1.png # Resources/Textures/Effects/speech.rsi/robot2.png # Resources/Textures/Effects/speech.rsi/slime0.png # Resources/Textures/Effects/speech.rsi/slime1.png # Resources/Textures/Effects/speech.rsi/slime2.png # Resources/Textures/Effects/speech.rsi/swarmer0.png # Resources/Textures/Effects/speech.rsi/swarmer1.png # Resources/Textures/Effects/speech.rsi/swarmer2.png # Resources/Textures/Effects/speech.rsi/syndibot0.png # Resources/Textures/Effects/speech.rsi/syndibot1.png # Resources/Textures/Effects/speech.rsi/syndibot2.png # Resources/Textures/Structures/Machines/microwave.rsi/meta.json # Resources/Textures/Structures/Machines/microwave.rsi/mw.png # Resources/Textures/Structures/Machines/microwave.rsi/mw0.png # Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png # Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png # Resources/Textures/Structures/Machines/microwave.rsi/mwb.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png # Resources/Textures/Structures/Machines/microwave.rsi/mwo.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/command.rsi/base.png # Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/command.rsi/open.png # Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/science.rsi/base.png # Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/science.rsi/open.png # Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png	2023-08-13 05:40:29 +03:00
Nemanja	98fa00a21f	Borgs (#18136) ... * Laws * positronic brain and PAI rewrite * MMI * MMI pt. 2 * borg brain transfer * Roleban support, Borg job (WIP), the end of mind shenaniganry * battery drain, item slot cleanup, alerts * visuals * fix this pt1 * fix this pt2 * Modules, Lingering Stacks, Better borg flashlight * Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power. * sprotes * no zombie borgs * oh fuck yeah i love a good relay * charger * fix the tiniest of sprite issues * adjustable names * a functional UI???? * foobar * more modules * this shit for some reason * upstream * genericize selectable borg modules * upstream again * holy fucking shit * i love christ * proper construction * da job * AA borgs * and boom more shit * admin logs * laws redux * ok just do this rq * oh boy that looks like modules * oh shit research * testos passo * so much shit holy fuck * fuckit we SHIP * last minute snags * should've gotten me on a better day	2023-08-12 16:39:58 -05:00
LinkUyx	a2284cb9b5	Revert nuclear bomb sprite (#1301)	2023-08-12 23:29:36 +03:00
deltanedas	ccd93dc464	vim!!!!!!11! (#15659)	2023-08-11 12:20:16 -04:00
Morb0	9a4db6ca8d	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Doors/Systems/AirlockSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Species/diona.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Tiles/attributions.yml	2023-08-11 03:09:35 +03:00
Flareguy	ea06a33a81	Updates asteroid tile sprites & adds asteroid plating (and tile items too, I guess) (#18937)	2023-08-10 10:46:43 -07:00
AlexMorgan3817	62ccbdaeae	Supermatter grenades (#13747) ... Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>	2023-08-11 00:29:47 +10:00
kxv	4772d9e6f5	stun prod (#17467) ... * stunprod * update alphabetical correct, the battery charge is less, stamina damage is less (5 hits now), graph id fixed * update crafting has become more difficult * update makeshiftstunprod * remove netsync * Update meta.json * fix * remove bluntStaminaDamageFactor	2023-08-10 12:33:34 +03:00
metalgearsloth	5688c40f0e	Resprite grappling hook (#18939)	2023-08-10 16:16:57 +10:00
Interrobang01	3457729ba4	Added Mustard (#18930)	2023-08-09 19:38:36 -06:00
Errant	5b2d20b654	Disabler inhand sprites (#18918)	2023-08-09 14:43:34 -06:00
Pieter-Jan Briers	07f932ae3c	New /vg/ nuke sprite (#18890)	2023-08-08 17:55:41 -04:00