Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/CharacterSetupGui.xaml # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Entities/Clothing/Back/satchel.yml # Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2023-11-04 12:16:53 +03:00
..
Markings	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-04 12:16:53 +03:00
Prototypes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-04 12:16:53 +03:00
HairStyles.cs	Lint more const string prototypes (#18922)	2023-08-13 20:26:59 -04:00
HumanoidAppearanceComponent.cs	Fix speaker color	2023-10-02 02:29:56 +03:00
HumanoidCharacterAppearance.cs	Species sponsor (#1480)	2023-10-03 02:50:23 +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-10-02 02:18:19 +03:00
SharedHumanoidMarkingModifierSystem.cs	Update trivial components to use auto comp states (#20539)	2023-09-28 16:20:29 -07:00
SkinColor.cs	closet skeleton event (#19802)	2023-09-19 15:05:17 +10:00