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
..
cargo_gifts.yml	Fix cargo gifts (#18449)	2023-07-30 12:53:54 -06:00
events.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
midround.yml	move ninja objectives code into generic antag system (#20186)	2023-09-21 07:33:18 -07:00
roundstart.yml	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)	2023-08-30 18:06:15 -07:00