diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index e16c061ff8f..0adef27f864 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -319,7 +319,11 @@ GLOBAL_LIST_INIT(hallucination_list, list( /datum/hallucination/oh_yeah/proc/bubble_attack(turf/landing) var/charged = FALSE //only get hit once - while(get_turf(bubblegum) != landing && target && target.stat != DEAD) + while(get_turf(bubblegum) != landing && target?.stat != DEAD) + if(!landing) + break + if((get_turf(bubblegum)).loc.z != landing.loc.z) + break bubblegum.forceMove(get_step_towards(bubblegum, landing)) bubblegum.setDir(get_dir(bubblegum, landing)) target.playsound_local(get_turf(bubblegum), 'sound/effects/meteorimpact.ogg', 150, 1)