Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/workflows/update-wiki.yml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/Markings/MarkingPrototype.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/manifest.yml		2023-09-24 12:56:24 +03:00
..
AdminRemarks	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
BanPanel	IP ban by default (#18545)	2023-08-01 16:05:14 -05:00
Bwoink	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
CustomControls	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
Logs	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
ManageSolutions	Fix solution EUIs (#20033)	2023-09-12 14:35:30 +10:00
Notes	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
SetOutfit	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
SpawnExplosion	Fix explosion preview/debug overlay (#20353)	2023-09-20 11:19:42 +10:00
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
AdminAnnounceWindow.xaml	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminAnnounceWindow.xaml.cs	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminMenuWindow.xaml	Defibrillator (#15922)	2023-05-03 10:10:19 +10:00
AdminMenuWindow.xaml.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-07-10 07:03:24 +03:00
AdminMenuWindowEui.cs	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
PermissionsEui.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00