Morb0 8daf4b3f32 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Structures/stairs.rsi/meta.json		2024-03-21 01:15:13 +03:00
..
Markings	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-23 02:53:18 +03:00
Prototypes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-11 08:37:54 +03:00
HairStyles.cs	Lint more const string prototypes (#18922)	2023-08-13 20:26:59 -04:00
HumanoidAppearanceComponent.cs	Remove Corvax speaker color	2024-01-26 01:37:25 +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
NamingSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-17 12:43:04 +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	2024-03-21 01:15:13 +03:00
SharedHumanoidMarkingModifierSystem.cs	Update trivial components to use auto comp states (#20539)	2023-09-28 16:20:29 -07:00
SkinColor.cs	Limits the minimum base skin color brightness for species with Hue coloration (#23605)	2024-01-06 20:40:29 +11:00