Merge pull request #5157 from Citadel-Station-13/upstream-merge-35025

[MIRROR] Warp whistle now respects notransform
2018-01-29 02:29:18 +00:00
parent 539621a846 80157a2292
commit 7673583ce1
1 changed files with 1 additions and 1 deletions
@@ -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