From 1bfcc062f2d7ad7925d4207a90c4ca9609b609b3 Mon Sep 17 00:00:00 2001 From: shamp <140359015+shampunj@users.noreply.github.com> Date: Fri, 19 Apr 2024 08:50:10 +0300 Subject: [PATCH] Stunprod rework (#25922) stunprod --- .../Objects/Weapons/Melee/stunprod.yml | 8 +++---- .../Graphs/improvised/makeshiftstunprod.yml | 23 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml index b0b166f6ce..9e187651ec 100644 --- 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 fa006a938b..024a7c5876 100644 --- 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 -- 2.52.0