Actually, move to the component

Simple-Station · Jul 13, 2024 · bb6c9a0 · bb6c9a0
1 parent d95a88e
commit bb6c9a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarComponent.cs b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarComponent.cs
@@ -2,5 +2,11 @@ namespace Content.Server.ShockCollar;
 
 [RegisterComponent]
 public sealed partial class ShockCollarComponent : Component
-{}
+{
+    [DataField]
+    public int ShockDamage = 1;
+
+    [DataField]
+    public TimeSpan ShockTime = TimeSpan.FromSeconds(2);
+}
 
diff --git a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
@@ -33,7 +33,7 @@ private void OnTrigger(EntityUid uid, ShockCollarComponent component, TriggerEve
             && !_useDelay.TryResetDelay((uid, useDelay), true))
             return;
 
-        _electrocutionSystem.TryDoElectrocution(containerEnt, null, 1, TimeSpan.FromSeconds(2), true, ignoreInsulation: true);
+        _electrocutionSystem.TryDoElectrocution(containerEnt, null, component.ShockDamage, component.ShockTime, true, ignoreInsulation: true);
     }
 }