From 3d63e9aa2057e8f60ada0474a45a39260fac3888 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Wed, 23 Oct 2019 00:50:05 +0000 Subject: [PATCH] throwing darts at the wall here --- code/modules/mob/living/carbon/damage_procs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index fbed6001d2..27993fe330 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -19,13 +19,13 @@ switch(damagetype) if(BRUTE) if(BP) - if(damage > 0 ? BP.receive_damage(damage * hit_percent, 0) : BP.heal_damage(abs(damage * hit_percent), 0)) + if(damage > 0 ? BP.receive_damage(damage_amount, forced = forced) : BP.heal_damage(abs(damage_amount, forced = forced), 0)) update_damage_overlays() else //no bodypart, we deal damage with a more general method. adjustBruteLoss(damage_amount, forced = forced) if(BURN) if(BP) - if(damage > 0 ? BP.receive_damage(0, damage * hit_percent) : BP.heal_damage(0, abs(damage * hit_percent))) + if(damage > 0 ? BP.receive_damage(0, damage_amount, forced = forced) : BP.heal_damage(0, abs(damage_amount, forced = forced))) update_damage_overlays() else adjustFireLoss(damage_amount, forced = forced)