Unstable 0.1300.0.5

Barotrauma/BarotraumaShared/SharedSource/Map/Map/Radiation.cs

@@ -48,7 +48,14 @@ namespace Barotrauma
             if (!Enabled) { return; }
             if (steps <= 0) { return; }
 
-            IncreaseRadiation(Params.RadiationStep * steps);
+            float increaseAmount = Params.RadiationStep * steps;
+
+            if (Params.MaxRadiation > 0 && Params.MaxRadiation < Amount + increaseAmount)
+            {
+                increaseAmount = Params.MaxRadiation - Amount;
+            }
+
+            IncreaseRadiation(increaseAmount);
 
             int amountOfOutposts = Map.Locations.Count(location => location.Type.HasOutpost && !location.IsCriticallyRadiated());
 

Barotrauma/BarotraumaShared/SharedSource/Map/Map/RadiationParams.cs

@@ -30,6 +30,9 @@ namespace Barotrauma
         [Serialize(defaultValue: 1f, isSaveable: false, "How much is the radiation affliction increased by while in a radiated zone.")]
         public float RadiationDamageAmount { get; set; }
 
+        [Serialize(defaultValue: -1.0f, isSaveable: false, "Maximum amount of radiation.")]
+        public float MaxRadiation { get; set; }
+
         [Serialize(defaultValue: "139,0,0,85", isSaveable: false, "The color of the radiated area.")]
         public Color RadiationAreaColor { get; set; }