NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-13 04:11:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Lobby/UI
History
Morb0 4bf8b9eed6 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-05-29 01:14:59 +03:00
..
Loadouts Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-15 18:53:52 +03:00
Roles Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
CharacterPickerButton.xaml Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
CharacterPickerButton.xaml.cs Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
CharacterSetupGui.xaml Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-15 18:53:52 +03:00
CharacterSetupGui.xaml.cs Return sponsor window to character setup 2024-05-23 15:44:14 +03:00
HighlightedContainer.xaml Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
HighlightedContainer.xaml.cs Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
HumanoidProfileEditor.xaml Fix upstream 2024-05-15 19:36:04 +03:00
HumanoidProfileEditor.xaml.cs Fix upstream 2024-05-15 19:36:04 +03:00
LobbyCharacterPreviewPanel.xaml Loadouts redux (#25715) 2024-04-16 22:57:43 +10:00
LobbyCharacterPreviewPanel.xaml.cs Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
LobbyGui.xaml Make the lobby AHelp button red for admins when one is received (#20390) 2023-09-21 17:40:57 +10:00
LobbyGui.xaml.cs Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
ObserveWarningWindow.xaml Fix late join & observe to de-admin admins. (#28319) 2024-05-28 14:00:42 -04:00
ObserveWarningWindow.xaml.cs Fix late join & observe to de-admin admins. (#28319) 2024-05-28 14:00:42 -04:00