Unstable 0.1300.0.4

Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs

@@ -244,7 +244,7 @@ namespace Barotrauma
                 cam.TargetPos = targetPos;
             }
 
-            cam.MoveCamera((float)deltaTime);
+            cam.MoveCamera((float)deltaTime, allowZoom: GUI.MouseOn == null);
 #endif
 
             foreach (Submarine sub in Submarine.Loaded)

Barotrauma/BarotraumaShared/SharedSource/Screens/NetLobbyScreen.cs

@@ -40,6 +40,7 @@ namespace Barotrauma
         public void SetRadiationEnabled(bool enabled)
         {
 #if CLIENT
+            if (radiationEnabledTickBox == null) { return; }
             radiationEnabledTickBox.Selected = enabled;
 #endif
         }
@@ -47,7 +48,7 @@ namespace Barotrauma
         public bool IsRadiationEnabled()
         {
 #if CLIENT
-            return radiationEnabledTickBox.Selected;
+            return radiationEnabledTickBox != null && radiationEnabledTickBox.Selected;
 #elif SERVER
             return GameMain.Server.ServerSettings.RadiationEnabled;
 #endif

Barotrauma/BarotraumaShared/SharedSource/Screens/Screen.cs

@@ -32,6 +32,7 @@
                     GUI.KeyboardDispatcher.Subscriber = null;
                     GUI.ScreenChanged = true;
                 }
+                SubmarinePreview.Close();
 #endif
             }
             selected = this;