From 88acc15fe5d3eb576c1cc22bebea4aa87e08de88 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 8 Dec 2019 03:46:55 +0100 Subject: [PATCH] scream if you want, it won't help you. Removes oxydamage from the "did you take damage" calculation for stuntime reduction --- code/datums/status_effects/debuffs.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index fb636f6911..00c19254d1 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -481,7 +481,7 @@ deltimer(timerid) -//Kindle: Used by servants of Ratvar. 10-second knockdown, reduced by 1 second per 5 damage taken while the effect is active. +//Kindle: Used by servants of Ratvar. 10-second knockdown, reduced by 1 second per 5 damage taken while the effect is active. Does not take into account Oxy-damage /datum/status_effect/kindle id = "kindle" status_type = STATUS_EFFECT_UNIQUE @@ -489,6 +489,7 @@ duration = 100 alert_type = /obj/screen/alert/status_effect/kindle var/old_health + var/old_oxydam /datum/status_effect/kindle/tick() owner.Knockdown(15, TRUE, FALSE, 15) @@ -498,7 +499,9 @@ C.stuttering = max(5, C.stuttering) if(!old_health) old_health = owner.health - var/health_difference = old_health - owner.health + if(!old_oxydam) + old_oxydam = owner.getOxyLoss() + var/health_difference = old_health - owner.health - CLAMP(owner.getOxyLoss() - old_oxyloss,0, owner.getOxyLoss()) if(!health_difference) return owner.visible_message("The light in [owner]'s eyes dims as [owner.p_theyre()] harmed!", \ @@ -506,6 +509,7 @@ health_difference *= 2 //so 10 health difference translates to 20 deciseconds of stun reduction duration -= health_difference old_health = owner.health + old_oxydam = owner.getOxyLoss() /datum/status_effect/kindle/on_remove() owner.visible_message("The light in [owner]'s eyes fades!", \