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
..
Markings	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Prototypes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
HairStyles.cs	Lint more const string prototypes (#18922)	2023-08-13 20:26:59 -04:00
HumanoidAppearanceComponent.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
HumanoidCharacterAppearance.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
HumanoidVisualLayers.cs	Marking default coloring (#13039)	2023-03-04 18:59:07 -08:00
HumanoidVisualLayersExtension.cs	Makes humanoid appearance component networked. (#13009)	2023-01-24 11:38:19 +11:00
ICharacterAppearance.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
NamingSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-06-28 16:02:06 +03:00
Sex.cs	Audible emotes (#12708)	2023-01-25 08:29:41 -08:00
SharedHumanoidAppearanceSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
SharedHumanoidMarkingModifierSystem.cs	Sex restriction for markings (#19894)	2023-09-19 16:56:10 -04:00
SkinColor.cs	closet skeleton event (#19802)	2023-09-19 15:05:17 +10:00