NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-12 03:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
CatStation/Content.Client/Preferences/UI
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
..
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 2023-09-13 16:51:52 +03:00
HumanoidProfileEditor.xaml.cs Species sponsor (#1480) 2023-10-03 02:50:23 +03:00