NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Preferences/UI
History
Exact
Morbo bdd758ea49 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Entry/EntryPoint.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Textures/Structures/Machines/microwave.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mw1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2022-12-21 20:29:22 +03:00
..
CharacterSetupGui.xaml Character setup in Lobby UI (#12007) 2022-10-18 08:45:32 +02:00
CharacterSetupGui.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-12-07 08:34:29 +03:00
HumanoidProfileEditor.Random.cs Let species prototypes define valid sexes (Sex Refactor) (#11520) 2022-10-15 14:45:47 -07:00
HumanoidProfileEditor.xaml Let species prototypes define valid sexes (Sex Refactor) (#11520) 2022-10-15 14:45:47 -07:00
HumanoidProfileEditor.xaml.cs Changes for prototype load parallelization (#13066) 2022-12-20 14:25:34 -08:00