From: The Canned One <greentopcan@gmail.com>
Date: Fri, 4 Oct 2024 06:31:55 +0000 (+0200)
Subject: minor Derelict Cyborg code changes.
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=581a4d14fc0fbc2c37fd75ebe0364c74e746b38a;p=space-station-14.git

minor Derelict Cyborg code changes.
---

diff --git a/Content.Server/Silicons/Laws/IonStormSystem.cs b/Content.Server/Silicons/Laws/IonStormSystem.cs
index b3c36a2273..f8bc8ca8c3 100644
--- a/Content.Server/Silicons/Laws/IonStormSystem.cs
+++ b/Content.Server/Silicons/Laws/IonStormSystem.cs
@@ -59,8 +59,10 @@ public sealed class IonStormSystem : EntitySystem
     [ValidatePrototypeId<DatasetPrototype>]
     private const string Foods = "IonStormFoods";
 
+    /// <summary>
     //Randomly alters the laws of an individual silicon.
-    public void IonStormTarget(Entity<SiliconLawBoundComponent, IonStormTargetComponent> ent, TransformComponent xform, EntityUid? chosenStation, bool adminlog = true)
+    /// </summary>
+    public void IonStormTarget(Entity<SiliconLawBoundComponent, IonStormTargetComponent> ent, bool adminlog = true)
     {
         var lawBound = ent.Comp1;
         var target = ent.Comp2;
diff --git a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs b/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
index d679b558b3..ee2ce7b9ed 100644
--- a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
+++ b/Content.Server/Silicons/Laws/StartIonStormedSystem.cs
@@ -24,14 +24,12 @@ public sealed class StartIonStormedSystem : EntitySystem
     {
         if (!TryComp<SiliconLawBoundComponent>(ent.Owner, out var lawBound))
             return;
-        if (!TryComp<TransformComponent>(ent.Owner, out var xform))
-            return;
         if (!TryComp<IonStormTargetComponent>(ent.Owner, out var target))
             return;
 
         for (int currentIonStorm = 0; currentIonStorm < ent.Comp.IonStormAmount; currentIonStorm++)
         {
-            _ionStorm.IonStormTarget((ent.Owner, lawBound, target), xform, null, false);
+            _ionStorm.IonStormTarget((ent.Owner, lawBound, target), 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 9b67f25608..e7c2d563ba 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, target), xform, chosenStation);
+            _ionStorm.IonStormTarget((ent, lawBound, target));
         }
     }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 97cd7c2a9d..22f49c93ea 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -540,7 +540,7 @@
 - type: entity
   id: PlayerBorgDerelictGhostRole
   parent: PlayerBorgDerelict
-  suffix: Battery, Ghost role
+  suffix: Ghost role
   components:
     - type: GhostRole
       name: ghost-role-information-derelict-cyborg-name