NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-13 20:31:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Humanoid/Systems
History
Morbo 1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Changelog/ChangelogManager.cs
#	Content.Client/Doors/AirlockVisualizer.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
..
HumanoidAppearanceSystem.cs Merge remote-tracking branch 'upstream/master' into master-syndie 2023-03-14 05:18:41 +03:00
HumanoidSystem.Modifier.cs Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
RandomHumanoidAppearanceSystem.cs Makes humanoid appearance component networked. (#13009) 2023-01-24 11:38:19 +11:00
RandomHumanoidSystem.cs Makes humanoid appearance component networked. (#13009) 2023-01-24 11:38:19 +11:00