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
..
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	ninja 2 electric boogaloo (#15534)	2023-09-10 16:20:27 +10:00
FirelockSystem.cs	Add Fire-fighting remote for Fire-doors (#16189)	2023-08-11 02:29:33 -07:00