NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 19:01:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
CatStation/Content.Client/Preferences/UI
History
Morb0 4f43e73d14 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
2024-03-11 08:37:54 +03:00
..
CharacterSetupGui.xaml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-11-04 12:16:53 +03:00
CharacterSetupGui.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-11-04 12:16:53 +03:00
HumanoidProfileEditor.Random.cs Add clothing toggle to character editor (#18903) 2023-08-08 23:26:33 -07:00
HumanoidProfileEditor.xaml Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-03-11 08:37:54 +03:00
HumanoidProfileEditor.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-03-11 08:37:54 +03:00