NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-21 07:41:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
CatStation/Content.Server/Humanoid/Systems
History
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
..
HumanoidAppearanceSystem.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-06 06:33:32 +03:00
HumanoidAppearanceSystem.Modifier.cs Sex restriction for markings (#19894) 2023-09-19 16:56:10 -04:00
RandomHumanoidAppearanceSystem.cs Remove usages of obsolete MetaDataComponent setters (#19582) 2023-08-28 19:20:31 +10:00
RandomHumanoidSystem.cs Remove AllComponentsOneEntityDeleteTest (#19965) 2023-09-09 19:35:05 -05:00