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
..
cabinets.rsi	Filing Cabinet Resprites (#8043)	2022-05-09 17:46:23 -07:00
canister.rsi	Frezon Canister Tweaks (#14442)	2023-03-13 23:42:07 -04:00
closet.rsi	Paramedic role, redone (#15439)	2023-05-01 17:13:56 +10:00
Crates	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12:02 +03:00
morgue.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
suit_storage.rsi	Updates the suit storage to tg 3/4 version (#16566)	2023-05-18 13:52:05 -04:00
tanks.rsi	[Resprite] Better tanks (#1095)	2023-06-30 02:28:29 +03:00
wall_locker.rsi	wall mounted lockers (#11382)	2022-09-17 13:05:39 -07:00