diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 71d719c523..0ff2077933 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -97,6 +97,8 @@ namespace Content.Client.Entry prototypes.RegisterIgnore("advertisementsPack"); prototypes.RegisterIgnore("metabolizerType"); prototypes.RegisterIgnore("metabolismGroup"); + prototypes.RegisterIgnore("gamePreset"); + prototypes.RegisterIgnore("gameRule"); ClientContentIoC.Register(); diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 38fcc66da9..a8bf76a178 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -204,6 +204,7 @@ namespace Content.Client.Lobby _lobby.ReadyButton.Text = Loc.GetString("lobby-state-ready-button-join-state"); _lobby.ReadyButton.ToggleMode = false; _lobby.ReadyButton.Pressed = false; + _lobby.ObserveButton.Disabled = false; } else { @@ -212,6 +213,7 @@ namespace Content.Client.Lobby _lobby.ReadyButton.ToggleMode = true; _lobby.ReadyButton.Disabled = false; _lobby.ReadyButton.Pressed = gameTicker.AreWeReady; + _lobby.ObserveButton.Disabled = true; } if (gameTicker.ServerInfoBlob != null) diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index cbab3cf710..b3d5a529a7 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -38,7 +38,7 @@ - +