Merge pull request Simple-Station#11 from FoxxoTrystan/Shockcollars

Shockcollars
Mnemotechnician · Jul 7, 2024 · 7db0342 · 7db0342
2 parents 97d3896 + cdd188c
commit 7db0342
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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, 5, TimeSpan.FromSeconds(2), true);
+        _electrocutionSystem.TryDoElectrocution(containerEnt, null, 1, TimeSpan.FromSeconds(2), true);
     }
 }
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -84,6 +84,7 @@
     idleState: icon
     runningState: building
     staticRecipes:
+      - ShockCollar # FloofStation
       - Wirecutter
       - Igniter
       - Signaller
@@ -742,6 +743,7 @@
       - ShellShotgunPractice
       - WeaponLaserCarbinePractice
       - WeaponDisablerPractice
+      - ShockCollar # Nyanotrasen - Shock Collar
       # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab
       - MagazineBoxSpecial
       - MagazineBoxSpecialPractice
@@ -798,7 +800,6 @@
       - WeaponLaserCarbine
       - ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
       - ClothingHeadCage # Nyanotrasen - Insulative headgear
-      - ShockCollar # Nyanotrasen - Shock Collar
       - WeaponXrayCannon
       - PowerCageSmall
       - PowerCageMedium