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
..
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	Equipment verbs & admin inventory access. (#14315)	2023-03-06 04:12:08 +11:00
Systems	Fix rsi sprite access for verbs (#14284)	2023-02-26 18:48:57 +11:00
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-03-07 18:54:29 +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