NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-16 05:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Humanoid/Systems
History
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
..
HumanoidAppearanceSystem.cs Fix speaker color 2023-10-02 02:29:56 +03:00
HumanoidAppearanceSystem.Modifier.cs Move ActorComponent to shared (#21293) 2023-10-29 04:21:02 +11: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