From d95a88e27fe0980abaf58c4516eeeabb2faa874c Mon Sep 17 00:00:00 2001 From: fox Date: Sat, 13 Jul 2024 11:20:48 +0300 Subject: [PATCH] Done --- .../Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs | 2 +- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs index 4b24f45401a..a39f0bbe99f 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, ignoreInsulation: true); } } diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 1ff5a7dbb62..84351aec635 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -743,6 +743,7 @@ - ShellShotgunPractice - WeaponLaserCarbinePractice - WeaponDisablerPractice + - ShockCollard # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab - MagazineBoxSpecial - MagazineBoxSpecialPractice