NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-14 12:51:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Preferences
History
Morbo f3bd98ceed Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
#	Content.Shared/Humanoid/HumanoidComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
2023-01-25 22:46:52 +03:00
..
UI Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-25 22:46:52 +03:00
ClientPreferencesManager.cs Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
IClientPreferencesManager.cs Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00