From 04d0fb1c1f91563f83288df5f4484cb74b25b71a Mon Sep 17 00:00:00 2001
From: S34NW <12197162+S34NW@users.noreply.github.com>
Date: Mon, 11 Oct 2021 20:44:21 +0100
Subject: [PATCH] non-space priority

---
 code/datums/spells/ethereal_jaunt.dm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 10438ee4925..742d3a5fda1 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -57,9 +57,15 @@
 	if(!QDELETED(target))
 		if(!(target.Move(mobloc)))
 			for(var/turf/T in orange(7))
+				if(istype(T, /turf/space))
+					continue
 				if(T && target.Move(T))
-					break
-		target.canmove = 1
+					target.canmove = 1
+					return
+			for(var/turf/space/S in orange(7)) //loop for space turfs in case there were no normal ones last loop
+				if(target.Move(S))
+					target.canmove = 1
+				return
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
 	var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()