Merge pull request #8917 from deathride58/fuckwarpwhistles

Fixes warp whistles
2019-07-20 11:54:48 -07:00
parent a39dbf2e85 ea5837bfb1
commit 3176cf958f
1 changed files with 5 additions and 1 deletions
@@ -385,9 +385,11 @@
 /obj/item/warpwhistle/attack_self(mob/living/carbon/user)
 	if(!istype(user) || on_cooldown)
 		return
+	var/turf/T = get_turf(user)
+	if(!T)
+		return
 	on_cooldown = TRUE
 	last_user = user
-	var/turf/T = get_turf(user)
 	playsound(T,'sound/magic/warpwhistle.ogg', 200, 1)
 	user.canmove = FALSE
 	new /obj/effect/temp_visual/tornado(T)
@@ -402,6 +404,8 @@
 		return
 	var/breakout = 0
 	while(breakout < 50)
+		if(!T)
+			break
 		var/turf/potential_T = find_safe_turf()
 		if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout)
 			user.forceMove(potential_T)