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
..
Commands	Load prototype command (#11275)	2022-09-15 11:43:50 +10:00
Components	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00
Managers	Client command perms cleanup. (#9599)	2022-07-10 15:43:44 +02:00
Systems	Ahelp / player list changes (#11392)	2022-10-15 14:26:29 -07:00
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2022-11-09 03:02:01 +03:00
AdminNameOverlay.cs	Ahelp / player list changes (#11392)	2022-10-15 14:26:29 -07:00
QuickDialogSystem.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00