From 42aae8f45f9ff253a6c03a7b9ecca06f2ee47bd2 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 17 Jul 2019 16:49:46 -0400 Subject: [PATCH 1/2] fixing warp whistles in literally two fucking lines --- code/modules/antagonists/wizard/equipment/artefact.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 7cfefd5413..0c33ce66ce 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -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) From ea5837bfb1851107a23176129d344e45630e10e9 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 17 Jul 2019 16:54:02 -0400 Subject: [PATCH 2/2] double the sanity check, double the stability --- code/modules/antagonists/wizard/equipment/artefact.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 0c33ce66ce..86493f6322 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -404,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)