Morbo 82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Resources/Audio/Announcements/license.txt # Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2023-03-07 18:54:29 +03:00
..
BanList	Add ban id to ban list, make ids label a button (#12700)	2022-11-21 20:04:24 +01:00
Bwoink	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00
CustomControls	Fix not being able to message players that weren't filtered by the ahelp menu (#13553)	2023-01-17 16:11:20 -06:00
Logs	Made ColorSelectorSliders use SpinBox instead of FloatSpinBox (#13702)	2023-03-06 10:07:49 -08:00
ManageSolutions	Solution rejig (#12428)	2023-01-12 14:41:40 +11:00
Notes	Add ban list window (#12574)	2022-11-14 20:06:55 +01:00
SetOutfit	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
SpawnExplosion	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00
Tabs	Made ColorSelectorSliders use SpinBox instead of FloatSpinBox (#13702)	2023-03-06 10:07:49 -08: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	Repository cleanup (#631)	2022-12-10 12:10:27 -08:00
AdminMenuWindowEui.cs	Make auto-closing admin announce window optional (#10277)	2022-08-03 17:39:09 -07:00
PermissionsEui.cs	Order permissions panel admins by username (#9782)	2022-07-17 14:23:26 +10:00