Merge remote-tracking branch 'upstream/master' into develop

Barotrauma/BarotraumaServer/ServerSource/Screens/NetLobbyScreen.cs

@@ -106,24 +106,6 @@ namespace Barotrauma
             }
         }
 
-        public void ChangeServerName(string n)
-        {
-            GameMain.Server.ServerSettings.ServerName = n; lastUpdateID++;
-        }
-
-        public void ChangeServerMessage(string m)
-        {
-            GameMain.Server.ServerSettings.ServerMessageText = m; lastUpdateID++;
-        }
-        
-        public List<JobPrefab> JobPreferences
-        {
-            get
-            {
-                return null;
-            }
-        }
-
         public NetLobbyScreen()
         {
             LevelSeed = ToolBox.RandomSeed(8);
@@ -175,7 +157,7 @@ namespace Barotrauma
             }
             set
             {
-                if (levelSeed == value) return;
+                if (levelSeed == value) { return; }
 
                 lastUpdateID++;
                 levelSeed = value;
@@ -205,6 +187,12 @@ namespace Barotrauma
             {
                 GameMain.GameSession = null;
             }
+            if (GameMain.Server.ServerSettings.SelectedSubmarine.IsNullOrEmpty())
+            {
+                //if no sub is selected in the settings,
+                //select the random sub we selected in the constructor
+                GameMain.Server.ServerSettings.SelectedSubmarine = SelectedSub?.Name;
+            }
         }
 
         public void RandomizeSettings()