From: The Canned One <greentopcan@gmail.com>
Date: Thu, 3 Oct 2024 09:34:24 +0000 (+0200)
Subject: Changes IonStorm related code with no gameplay changes.
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=963009a440cee3d47ab297b5aa7a76e3dfcaf569;p=space-station-14.git

Changes IonStorm related code with no gameplay changes.
---

diff --git a/Content.Server/Silicons/Laws/IonStormSystem.cs b/Content.Server/Silicons/Laws/IonStormSystem.cs
index b8d8f432e7..637155228c 100644
--- a/Content.Server/Silicons/Laws/IonStormSystem.cs
+++ b/Content.Server/Silicons/Laws/IonStormSystem.cs
@@ -60,8 +60,10 @@ public sealed class IonStormSystem : EntitySystem
     private const string Foods = "IonStormFoods";
 
     //Randomly alters the laws of an individual silicon.
-    public void IonStormTarget(EntityUid ent, SiliconLawBoundComponent lawBound, TransformComponent xform, IonStormTargetComponent target, EntityUid? chosenStation, bool adminlog = true)
+    public void IonStormTarget(Entity<SiliconLawBoundComponent, IonStormTargetComponent> ent, TransformComponent xform, EntityUid? chosenStation, bool adminlog = true)
     {
+        var lawBound = ent.Comp1;
+        var target = ent.Comp2;
         if (!_robustRandom.Prob(target.Chance))
             return;
 
diff --git a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs b/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
index 546b3b2777..d679b558b3 100644
--- a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
+++ b/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
@@ -31,7 +31,7 @@ public sealed class StartIonStormedSystem : EntitySystem
 
         for (int currentIonStorm = 0; currentIonStorm < ent.Comp.IonStormAmount; currentIonStorm++)
         {
-            _ionStorm.IonStormTarget(ent.Owner, lawBound, xform, target, null, false);
+            _ionStorm.IonStormTarget((ent.Owner, lawBound, target), xform, null, false);
         }
 
         var laws = _siliconLaw.GetLaws(ent.Owner, lawBound);
diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index 26f6d3263f..9b67f25608 100644
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -24,7 +24,7 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
             if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
                 continue;
 
-            _ionStorm.IonStormTarget(ent, lawBound, xform, target, chosenStation);
+            _ionStorm.IonStormTarget((ent, lawBound, target), xform, chosenStation);
         }
     }
 }