diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 46c15db0aa9..f47732af871 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -10,6 +10,8 @@
 	range = -1
 	include_user = 1
 
+
+	var phaseshift = 0
 	var/jaunt_duration = 50 //in deciseconds
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
@@ -25,26 +27,45 @@
 			animation.icon_state = "liquify"
 			animation.layer = 5
 			animation.master = holder
-			flick("liquify",animation)
-			target.loc = holder
-			target.client.eye = holder
-			var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
-			steam.set_up(10, 0, mobloc)
-			steam.start()
-			sleep(jaunt_duration)
-			mobloc = get_turf(target.loc)
-			animation.loc = mobloc
-			steam.location = mobloc
-			steam.start()
-			target.canmove = 0
-			sleep(20)
-			flick("reappear",animation)
-			sleep(5)
-			target.loc = mobloc
-			target.canmove = 1
-			target.client.eye = target
-			del(animation)
-			del(holder)
+			if(phaseshift == 1)
+				animation.dir = target.dir
+				flick("phase_shift",animation)
+				target.loc = holder
+				target.client.eye = holder
+				sleep(jaunt_duration)
+				mobloc = get_turf(target.loc)
+				animation.loc = mobloc
+				target.canmove = 0
+				sleep(20)
+				animation.dir = target.dir
+				flick("phase_shift2",animation)
+				sleep(5)
+				target.loc = mobloc
+				target.canmove = 1
+				target.client.eye = target
+				del(animation)
+				del(holder)
+			else
+				flick("liquify",animation)
+				target.loc = holder
+				target.client.eye = holder
+				var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
+				steam.set_up(10, 0, mobloc)
+				steam.start()
+				sleep(jaunt_duration)
+				mobloc = get_turf(target.loc)
+				animation.loc = mobloc
+				steam.location = mobloc
+				steam.start()
+				target.canmove = 0
+				sleep(20)
+				flick("reappear",animation)
+				sleep(5)
+				target.loc = mobloc
+				target.canmove = 1
+				target.client.eye = target
+				del(animation)
+				del(holder)
 
 /obj/effect/dummy/spell_jaunt
 	name = "water"
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index 311be1b3ba9..b712e931318 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -317,5 +317,5 @@
 	invocation_type = "none"
 	range = -1
 	include_user = 1
-
+	phaseshift = 1
 	jaunt_duration = 50 //in deciseconds
diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm
index fdf0304167e..a2dd055f8e1 100644
--- a/code/defines/obj/computer.dm
+++ b/code/defines/obj/computer.dm
@@ -58,19 +58,6 @@
 	var/temp = null
 
 
-/obj/machinery/computer/hologram_comp
-	name = "Hologram Computer"
-	desc = "Rumoured to control holograms."
-	icon = 'stationobjs.dmi'
-	icon_state = "holo_console0"
-	var/obj/machinery/hologram/projector/projector = null
-	var/temp = null
-	var/lumens = 0.0
-	var/h_r = 245.0
-	var/h_g = 245.0
-	var/h_b = 245.0
-
-
 /obj/machinery/computer/security
 	name = "Security Cameras"
 	desc = "Used to access the various cameras on the station."
diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm
index 5539a616f49..278a0704ff8 100644
--- a/code/game/machinery/computer/hologram.dm
+++ b/code/game/machinery/computer/hologram.dm
@@ -1,3 +1,17 @@
+/obj/machinery/computer/hologram_comp
+	name = "Hologram Computer"
+	desc = "Rumoured to control holograms."
+	icon = 'stationobjs.dmi'
+	icon_state = "holo_console0"
+	var
+		obj/machinery/hologram/projector/projector = null
+		temp = null
+		lumens = 0.0
+		h_r = 245.0
+		h_g = 245.0
+		h_b = 245.0
+
+
 /obj/machinery/computer/hologram_comp/New()
 	..()
 	spawn( 10 )
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 38752c9cb9b..c37fb23a2a7 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ