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
..
CustomControls	Ahelp / player list changes (#11392)	2022-10-15 14:26:29 -07:00
Logs	Fixing UI bugs (#11716)	2022-10-06 13:21:29 +11:00
ManageSolutions	Tweak solution editing window (#6587)	2022-02-10 13:05:45 +11:00
Notes	Fixing UI bugs (#11716)	2022-10-06 13:21:29 +11:00
SetOutfit	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
SpawnExplosion	Fix explosion overlay bounds (#11074)	2022-09-06 15:27:29 +10:00
Tabs	Content side for removing IMap / IMapGrid comps (#12357)	2022-11-04 10:12:25 +11:00
AdminAnnounceWindow.xaml	Make auto-closing admin announce window optional (#10277)	2022-08-03 17:39:09 -07:00
AdminAnnounceWindow.xaml.cs	Minor UI refactor (#11212)	2022-09-11 20:42:12 -07:00
AdminMenuWindow.xaml	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00
AdminMenuWindow.xaml.cs	Change windows size (#515)	2022-11-04 08:20:44 -07:00
AdminMenuWindowEui.cs	Make auto-closing admin announce window optional (#10277)	2022-08-03 17:39:09 -07:00
BwoinkWindow.xaml	Admin notes (#7259)	2022-04-16 20:57:50 +02:00
BwoinkWindow.xaml.cs	Fix player list sorting (#12457)	2022-11-08 14:19:49 -06:00
PermissionsEui.cs	Order permissions panel admins by username (#9782)	2022-07-17 14:23:26 +10:00