From 3bfc62fbb94518a5ba3cd3d81a94be35cb716463 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 9 Apr 2020 21:55:02 -0700 Subject: [PATCH] dmg --- .../code/modules/mob/living/carbon/damage_procs.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm index a2b9c601dc..0aff45224a 100644 --- a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm +++ b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm @@ -14,7 +14,16 @@ /mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST) if(!forced && (status_flags & GODMODE)) return FALSE - apply_damage(amount > 0 ? amount*incomingstammult : amount, STAMINA, affected_zone) + var/obj/item/bodypart/BP + if(isbodypart(affected_zone)) //we specified a bodypart object + BP = def_zone + else + BP = get_bodypart(check_zone(affecteed_zone)) || bodyparts[1] + if(amount > 0? BP.receieve_damage(0, 0, amount) : BP.heal_damage(0, 0, abs(amount))) + update_damage_overlays() + if(updating_health) + updatehealth() + updatestamina() if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && amount > 20) incomingstammult = max(0.01, incomingstammult/(amount*0.05)) return amount