Morbo d7d2dd96c0 Merge remote-tracking branch 'upstream/master' into upstream-sync2 ... # Conflicts: # Content.Client/PDA/PDAMenu.xaml # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Humanoid/NamingSystem.cs # Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json		2022-11-09 03:02:01 +03:00
..
AirlockComponent.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-10-18 21:23:46 +03:00
FirelockComponent.cs	Fix firelock danger indicators (#12327)	2022-11-08 13:55:45 -06:00