VigersRay 7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/Roles/JobPrototype.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Roles/Antags/nukeops.yml # Resources/Prototypes/Roles/Antags/revolutionary.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Antags/zombie.yml		2024-06-07 11:28:58 +03:00
..
UI	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-07 11:28:58 +03:00
ClientPreferencesManager.cs	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
IClientPreferencesManager.cs	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10:00
LobbyState.cs	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
LobbyUIController.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-07 11:28:58 +03:00