Unstable 0.1300.0.4

2021-03-30 15:51:49 +03:00
parent 58c50a235d
commit 862221635c
108 changed files with 907 additions and 378 deletions
@@ -55,6 +55,10 @@ namespace Barotrauma
                {
                    chatBox.ToggleOpen = wasChatBoxOpen;
                }
+                if (!value && CampaignUI?.SelectedTab == InteractionType.PurchaseSub)
+                {
+                    SubmarinePreview.Close();
+                }
                showCampaignUI = value;
            }
        }
@@ -533,7 +533,7 @@ namespace Barotrauma

            base.Update(deltaTime);
            
-            Map?.Radiation.UpdateRadiation(deltaTime);
+            Map?.Radiation?.UpdateRadiation(deltaTime);

            if (PlayerInput.SecondaryMouseButtonClicked() ||
                PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.Escape))