(684b4ac74) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaClient/Source/GUI/GUIStyle.cs

@@ -40,6 +40,9 @@ namespace Barotrauma
             {
                 ToolBox.IsProperFilenameCase(file);
                 doc = XDocument.Load(file, LoadOptions.SetBaseUri);
+                if (doc == null) { throw new Exception("doc is null"); }
+                if (doc.Root == null) { throw new Exception("doc.Root is null"); }
+                if (doc.Root.Elements() == null) { throw new Exception("doc.Root.Elements() is null"); }
             }
             catch (Exception e)
             {
@@ -113,26 +116,34 @@ namespace Barotrauma
 
         private void RescaleFonts()
         {
+            if (configElement == null) { return; }
+            if (configElement.Elements() == null) { return; }
             foreach (XElement subElement in configElement.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
                     case "font":
+                        if (Font == null) { continue; }
                         Font.Size = GetFontSize(subElement);
                         break;
                     case "smallfont":
+                        if (SmallFont == null) { continue; }
                         SmallFont.Size = GetFontSize(subElement);
                         break;
                     case "largefont":
+                        if (LargeFont == null) { continue; }
                         LargeFont.Size = GetFontSize(subElement);
                         break;
                     case "objectivetitle":
+                        if (ObjectiveTitleFont == null) { continue; }
                         ObjectiveTitleFont.Size = GetFontSize(subElement);
                         break;
                     case "objectivename":
+                        if (ObjectiveNameFont == null) { continue; }
                         ObjectiveNameFont.Size = GetFontSize(subElement);
                         break;
                     case "videotitle":
+                        if (VideoTitleFont == null) { continue; }
                         VideoTitleFont.Size = GetFontSize(subElement);
                         break;
                 }

Barotrauma/BarotraumaClient/Source/Screens/SteamWorkshopScreen.cs

@@ -452,7 +452,7 @@ namespace Barotrauma
                     }
                 }
 
-                if (Rand.Range(0.0f, 1.0f) < 0.5f)//listBox != publishedItemList && SteamManager.CheckWorkshopItemEnabled(item) && !SteamManager.CheckWorkshopItemUpToDate(item))
+                if (listBox != publishedItemList && SteamManager.CheckWorkshopItemEnabled(item) && !SteamManager.CheckWorkshopItemUpToDate(item))
                 {
                     new GUIButton(new RectTransform(new Vector2(0.4f, 0.5f), rightColumn.RectTransform, Anchor.BottomLeft), text: TextManager.Get("WorkshopItemUpdate"))
                     {

Barotrauma/BarotraumaShared/Source/DebugConsole.cs

@@ -380,7 +380,7 @@ namespace Barotrauma
                 };
             }));
                        
-            commands.Add(new Command("banid", "banid [id]: Kick and ban the player with the specified client ID from the server.", (string[] args) =>
+            commands.Add(new Command("banid", "banid [id]: Kick and ban the player with the specified client ID from the server. You can see the IDs of the clients using the command \"clientlist\".", (string[] args) =>
             {
                 if (GameMain.NetworkMember == null || args.Length == 0) return;