Morbo a93a3fb752 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/bar.png # Resources/Textures/Tiles/clown.png # Resources/Textures/Tiles/dark.png # Resources/Textures/Tiles/hydro.png # Resources/Textures/Tiles/kitchen.png # Resources/Textures/Tiles/laundry.png # Resources/Textures/Tiles/steel.png # Resources/Textures/Tiles/steel_dirty.png # Resources/Textures/Tiles/white.png		2022-10-23 17:55:21 +03:00
..
Markings	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
Prototypes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-10-23 17:55:21 +03:00
HairStyles.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
HumanoidCharacterAppearance.cs	Humanoid fixes (#11538)	2022-09-26 14:46:57 -05:00
HumanoidVisualizerKeys.cs	Humanoid fixes (#11538)	2022-09-26 14:46:57 -05:00
HumanoidVisualLayers.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
HumanoidVisualLayersExtension.cs	ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)	2022-10-22 15:46:28 -07:00
ICharacterAppearance.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
NamingSystem.cs	Use gender distinguish for last names	2022-10-16 02:06:09 +03:00
Sex.cs	Let species prototypes define valid sexes (Sex Refactor) (#11520)	2022-10-15 14:45:47 -07:00
SharedHumanoidComponent.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
SharedHumanoidMarkingModifierSystem.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
SharedHumanoidSystem.cs	Humanoid fixes (#11538)	2022-09-26 14:46:57 -05:00
SkinColor.cs	Humanoid fixes (#11538)	2022-09-26 14:46:57 -05:00