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
..
Airlocks	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
assembly.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
edge_door_hazard.rsi	Fix some more rsis (#13107)	2022-12-20 09:37:34 +01:00
effects.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
MineralDoors	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
secret_door.rsi	[Resprite] Secret Door (#1342)	2023-08-17 08:50:58 +03:00
Shutters	Tweak Window Shutters to have a rectangular window. (#6564)	2022-02-08 15:38:19 -07:00
web_door.rsi	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windoors/windoor.rsi	Added bolt and emergency layer for opened windoor (#960)	2023-04-05 12:28:37 -07:00