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
..
AirlockSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-11 03:09:35 +03:00
DoorBoltSystem.cs	Split Door Bolt functionality out of AirlockDoor (#16354)	2023-05-31 10:23:35 -04:00
DoorSystem.cs	Weldable cleanup (#19809)	2023-09-05 00:07:01 +10:00
FirelockSystem.cs	Add Fire-fighting remote for Fire-doors (#16189)	2023-08-11 02:29:33 -07:00