From 6d8d8ea3f32491f558ed50834a3fde97226970fe Mon Sep 17 00:00:00 2001
From: Vanessa <vanessalouwagie@gmail.com>
Date: Thu, 1 Jan 2026 16:12:21 -0600
Subject: [PATCH] Reduced stamina damage modifier of adv truncheon. Made jugg
 suit live up to its name.

---
 .../Entities/Clothing/OuterClothing/hardsuits.yml           | 1 +
 .../Entities/Objects/Weapons/Melee/advanced_truncheon.yml   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 19bdf2cdc93..4b8a8d0732f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -782,6 +782,7 @@
     damageCoefficient: 0.3
   - type: StaminaResistance # DeltaV
     damageCoefficient: 0.1
+    meleeResistance: true
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/advanced_truncheon.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/advanced_truncheon.yml
index ba1a469716a..18cc368fbd9 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/advanced_truncheon.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/advanced_truncheon.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: Truncheon
   id: AdvancedTruncheon
-  name: Advanced Truncheon
+  name: advanced truncheon
   description: A longer, rigid, steel-studded baton, meant to harm more!
   components:
   - type: Sprite
@@ -12,7 +12,7 @@
     damage:
       types:
         Blunt: 22.5
-    bluntStaminaDamageFactor: 1.60 # 36 stamina damage
+    bluntStaminaDamageFactor: 1.2 # Before resists, 27 stamina damage, 36 while wielded, 48.6 when wielded by an Oni
 #  - type: MeleeStaminaCost
 #    swing: 10
 #    wieldCoefficient: 0.35 #if wielded you will only consume 3.5 stam its a weapon after all
@@ -20,7 +20,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 7.5
+        Blunt: 7.5 # 30 when wielded, 40.5 when wielded by an Oni
   - type: Clothing
     sprite: _DV/Objects/Weapons/Melee/advanced_truncheon.rsi
     quickEquip: false