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/UI
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
..
CharacterSetupGui.xaml Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
CharacterSetupGui.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-25 22:46:52 +03:00
HumanoidProfileEditor.Random.cs Let species prototypes define valid sexes (Sex Refactor) (#11520) 2022-10-15 14:45:47 -07:00
HumanoidProfileEditor.xaml TTS voice mask support (#748) 2023-01-15 07:13:18 -08:00
HumanoidProfileEditor.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-25 22:46:52 +03:00