Stunprod rework (#25922)

stunprod

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
index b0b166f6ce815c9a40333f38fede0ea085a24ce5..9e187651ec554e65826bd703c19fd1b1c50aaa75 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -25,9 +25,9 @@
   - type: ItemToggleMeleeWeapon
     activatedDamage:
       types:
-        Blunt: 0
+        Shock: 5
   - type: Stunbaton
-    energyPerUse: 70
+    energyPerUse: 120
   - type: MeleeWeapon
     wideAnimationRotation: -135
     damage:
@@ -36,10 +36,10 @@
     angle: 60
     animation: WeaponArcThrust
   - type: StaminaDamageOnHit
-    damage: 20
+    damage: 35
     sound: /Audio/Weapons/egloves.ogg
   - type: StaminaDamageOnCollide
-    damage: 20
+    damage: 35
     sound: /Audio/Weapons/egloves.ogg
   - type: Battery
     maxCharge: 360

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
index fa006a938bd79c570302570938f7ad56a516de24..024a7c58763f5ee2106def22c18ca1dd76ae8809 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
@@ -8,24 +8,23 @@
           steps:
             - material: MetalRod
               amount: 1
-            - material: Cable
-              amount: 15
-            - tag: DrinkSpaceGlue
-              name: Drink Space Glue
-              icon:
-                sprite: Objects/Consumable/Drinks/glue-tube.rsi
-                state: icon
             - tag: PowerCellSmall
               name: Power Cell Small
               icon:
                 sprite: Objects/Power/power_cells.rsi
                 state: small
-            - tag: CapacitorStockPart
-              name: Capacitor Stock Part
+            - tag: Handcuffs
               icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
-              doAfter: 20
+                sprite: Objects/Misc/cablecuffs.rsi
+                state: cuff
+                color: red
+              name: cuffs
+            - tag: Igniter
+              name: Igniter
+              icon:
+                sprite: Objects/Devices/igniter.rsi
+                state: icon
+              doAfter: 15
     - node: msstunprod
       entity: Stunprod