Return SS220 IonStormRework after merge conflict

SerbiaStrong-220 · Dec 1, 2024 · 6f32d13 · 6f32d13
1 parent 28561ee
commit 6f32d13
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Content.Server/Silicons/Laws/IonStormSystem.cs b/Content.Server/Silicons/Laws/IonStormSystem.cs
@@ -58,6 +58,10 @@ public sealed class IonStormSystem : EntitySystem
     private const string Drinks = "IonStormDrinks";
     [ValidatePrototypeId<DatasetPrototype>]
     private const string Foods = "IonStormFoods";
+    // SS220 IonStrom Laws rework start
+    [ValidatePrototypeId<DatasetPrototype>]
+    private const string BrickedLaw = "IonStormBrickedLaws";
+    // SS220 IonStrom Laws rework end
 
     /// <summary>
     /// Randomly alters the laws of an individual silicon.
@@ -111,7 +115,10 @@ public void IonStormTarget(Entity<SiliconLawBoundComponent, IonStormTargetCompon
         }
 
         // generate a new law...
-        var newLaw = GenerateLaw();
+        // SS220 IonStrom Laws rework start
+        // var newLaw = GenerateLaw();
+        var newLaw = Pick(BrickedLaw);
+        // SS220 IonStrom Laws rework end
 
         // see if the law we add will replace a random existing law or be a new glitched order one
         if (laws.Laws.Count > 0 && _robustRandom.Prob(target.ReplaceChance))