From 94d2ac226fa1954c2017e65c8e21890206f06b47 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Tue, 9 Jun 2020 03:55:52 -0700 Subject: [PATCH] Combo damage types no longer shrink armor values passed to them. --- code/modules/mob/living/damage_procs.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index ed74c02828..03fd22609b 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -18,6 +18,9 @@ damage -= round(damage*0.8) else damage -= soaked + + var/initial_blocked = blocked + blocked = (100-blocked)/100 switch(damagetype) if(BRUTE) @@ -27,8 +30,8 @@ damage = 0 adjustFireLoss(damage * blocked) if(SEARING) - apply_damage(damage / 3, BURN, def_zone, blocked, soaked, used_weapon, sharp, edge) - apply_damage(damage / 3 * 2, BRUTE, def_zone, blocked, soaked, used_weapon, sharp, edge) + apply_damage(round(damage / 3), BURN, def_zone, initial_blocked, soaked, used_weapon, sharp, edge) + apply_damage(round(damage / 3 * 2), BRUTE, def_zone, initial_blocked, soaked, used_weapon, sharp, edge) if(TOX) adjustToxLoss(damage * blocked) if(OXY) @@ -41,7 +44,7 @@ electrocute_act(damage, used_weapon, 1.0, def_zone) if(BIOACID) if(isSynthetic()) - adjustFireLoss(damage * blocked) + apply_damage(damage, BURN, def_zone, initial_blocked, soaked, used_weapon, sharp, edge) // Handle it as normal burn. else adjustToxLoss(damage * blocked) flash_weak_pain()