From e20cbe5aa7ee0e834a5fd95822dc2de7cbaa6f1d Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Fri, 5 Jan 2018 04:04:38 -0800 Subject: [PATCH] Fixes infernal jaunt causing devils to get stuck if interrupted (#34056) * Fixes infernal jaunt causing devils to get stuck if stunned. * defines because I know a maintainer will yell at me for this. --- code/modules/spells/spell_types/devil.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm index 733d0a3270..e9b8a458a8 100644 --- a/code/modules/spells/spell_types/devil.dm +++ b/code/modules/spells/spell_types/devil.dm @@ -118,14 +118,15 @@ revert_cast() return ..() else - user.notransform = 1 + user.notransform = TRUE user.fakefire() to_chat(src, "You begin to phase back into sinful flames.") if(do_mob(user,user,150)) user.infernalphaseout() else to_chat(user, "You must remain still while exiting.") - user.ExtinguishMob() + user.notransform = FALSE + user.fakefireextinguish() start_recharge() return revert_cast()