From a4c0a4e4be3acf760c9275b1deeb94d77194df5f Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Fri, 22 Feb 2019 14:58:52 +0100 Subject: [PATCH] Clockwork kindle stun now respects the owner's remaining health (#7999) * clock slab OP pls nerf * I'll go check if this can actually do later. * In a clunky motion, it rails back onto the tracks. --- code/datums/status_effects/debuffs.dm | 2 +- .../antagonists/clockcult/clock_helpers/slab_abilities.dm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 9904a28d84..1c77520108 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -458,7 +458,7 @@ var/old_health /datum/status_effect/kindle/tick() - owner.Knockdown(15) + owner.Knockdown(15, TRUE, FALSE, 15) if(iscarbon(owner)) var/mob/living/carbon/C = owner C.silent = max(2, C.silent) diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index 41f501e346..530c4c5662 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -194,10 +194,12 @@ else L.visible_message("[L]'s eyes blaze with brilliant light!", \ "Your vision suddenly screams with white-hot light!") - L.Knockdown(160) - L.adjustStaminaLoss(140) // now kindle works pretty much like bloodcult stun knockdown and stamcrit wise + L.Knockdown(15, TRUE, FALSE, 15) L.apply_status_effect(STATUS_EFFECT_KINDLE) L.flash_act(1, 1) + if(issilicon(target)) + var/mob/living/silicon/S = L + S.emp_act(EMP_HEAVY) if(iscultist(L)) L.adjustFireLoss(15) ..()