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 4
CatStation/Content.Client/Preferences/UI
History
Morb0 2329662efd Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
2024-04-18 07:04:01 +03:00
..
AntagPreferenceSelector.cs Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
CharacterSetupGui.xaml Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-17 11:57:44 +03:00
CharacterSetupGui.xaml.cs Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-17 15:45:55 +03:00
HighlightedContainer.xaml Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
HighlightedContainer.xaml.cs Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
HumanoidProfileEditor.Random.cs Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
HumanoidProfileEditor.xaml Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-17 11:57:44 +03:00
HumanoidProfileEditor.xaml.cs Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-18 07:04:01 +03:00
JobPrioritySelector.cs Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
LoadoutContainer.xaml Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
LoadoutContainer.xaml.cs Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
LoadoutGroupContainer.xaml Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
LoadoutGroupContainer.xaml.cs Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
LoadoutWindow.xaml Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
LoadoutWindow.xaml.cs Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
RequirementsSelector.cs LobbyUI fixes (#27033) 2024-04-17 12:54:54 +10:00