NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 19:31:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
CatStation/Content.Client/Preferences/UI
History
Morbo 82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Audio/Announcements/license.txt
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +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 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-27 21:05:54 +03:00
HumanoidProfileEditor.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-03-07 18:54:29 +03:00