Morb0 34a8740819 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/build-test-release.yml # Content.Client/Humanoid/HumanoidAppearanceSystem.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml		2023-10-02 02:18:19 +03:00
..
AdminShuttleWindow.xaml	Fix shuttle call window (#898)	2023-03-18 16:14:44 -07:00
AdminShuttleWindow.xaml.cs	Slight localization func cleanup (#11380)	2022-10-18 19:51:18 -07:00
AdminTab.xaml	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
AdminTab.xaml.cs	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
PlayerActionsWindow.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
PlayerActionsWindow.xaml.cs	Add confirmation to kick and respawn in the admin player actions panel (#20542)	2023-09-28 15:46:06 -07:00
TeleportWindow.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
TeleportWindow.xaml.cs	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00