From b543882c64eb056aa9793447dada93e1e33de2af Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 28 Jan 2018 19:07:46 -0200 Subject: [PATCH] Merge pull request #35025 from vuonojenmustaturska/toot Warp whistle now respects notransform --- code/game/gamemodes/wizard/artefact.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index a5b8133c53..94ecac2b79 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -347,7 +347,7 @@ var/mob/living/carbon/last_user /obj/item/warpwhistle/proc/interrupted(mob/living/carbon/user) - if(!user || QDELETED(src)) + if(!user || QDELETED(src) || user.notransform) on_cooldown = FALSE return TRUE return FALSE