From 6ec1b66a9d00f1edf80829622e4070f13767c026 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 17 Jun 2017 15:37:28 -0500 Subject: [PATCH] Refactors soundbang_act to use adjustEarDamage (#1467) --- code/modules/mob/living/carbon/carbon_defense.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index b282d9894a..91e75034b4 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -317,8 +317,9 @@ Weaken(stun_pwr*effect_amount) if(istype(ears) && (deafen_pwr || damage_pwr)) - ears.ear_damage += damage_pwr * effect_amount - ears.deaf = max(ears.deaf, deafen_pwr * effect_amount) + var/ear_damage = damage_pwr * effect_amount + var/deaf = max(ears.deaf, deafen_pwr * effect_amount) + adjustEarDamage(ear_damage,deaf) if(ears.ear_damage >= 15) to_chat(src, "Your ears start to ring badly!")