From cdd188c4f8ccc86811db68154e75749bdb2b60dc Mon Sep 17 00:00:00 2001
From: FoxxoTrystan <trystan.garnierhein@gmail.com>
Date: Sat, 6 Jul 2024 19:34:20 +0200
Subject: [PATCH] Shocking!

---
 .../Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs          | 2 +-
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
index 4b24f45401a..70e5ee65abd 100644
--- 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
index 2a10abf3b34..6b478a646e6 100644
--- 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