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
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
..
UI Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-29 01:14:59 +03:00
ClientPreferencesManager.cs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-15 18:53:52 +03:00
IClientPreferencesManager.cs Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
LobbyState.cs Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
LobbyUIController.cs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-15 18:53:52 +03:00