*Dramatic low-pitch scenic sound plays in*

code/modules/VR/vr_sleeper.dm

@@ -93,10 +93,7 @@
 			if(human_occupant && human_occupant.mind && usr == occupant)
 				to_chat(occupant, "<span class='warning'>Transferring to virtual reality...</span>")
 				if(vr_mob && vr_mob.stat == CONSCIOUS && !vr_mob.GetComponent(/datum/component/virtual_reality))
-					SStgui.close_user_uis(occupant, src)
-					vr_mob.AddComponent(/datum/component/virtual_reality, human_occupant.mind, src, you_die_in_the_game_you_die_for_real)
-					human_occupant.audiovisual_redirect = vr_mob
-					vr_mob.ckey = human_occupant.ckey
+					vr_mob.AddComponent(/datum/component/virtual_reality, human_occupant, src, you_die_in_the_game_you_die_for_real)
 					to_chat(vr_mob, "<span class='notice'>Transfer successful! You are now playing as [vr_mob] in VR!</span>")
 				else
 					if(allow_creating_vr_mobs)
@@ -164,10 +161,7 @@
 		vr_H.updateappearance(TRUE, TRUE, TRUE)
 	if(!transfer || !H.mind)
 		return
-	vr_mob.AddComponent(/datum/component/virtual_reality, H.mind, src, you_die_in_the_game_you_die_for_real)
-	SStgui.close_user_uis(H, src)
-	H.audiovisual_redirect = vr_mob
-	vr_mob.ckey = H.ckey
+	vr_mob.AddComponent(/datum/component/virtual_reality, H, src, you_die_in_the_game_you_die_for_real)
 
 /obj/machinery/vr_sleeper/proc/cleanup_vr_mob()
 	if(vr_mob)

code/modules/mob/dead/observer/observer.dm

@@ -260,9 +260,9 @@ Transfer_mind is there to check if mob is being deleted/not going to have a body
 Works together with spawning an observer, noted above.
 */
 
-/mob/proc/ghostize(can_reenter_corpse = TRUE, send_the_signal = TRUE)
-	if(!key || cmptext(copytext(key,1,2),"@") || (send_the_signal && SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, can_reenter_corpse) & COMPONENT_BLOCK_GHOSTING))
-		return //mob has no key, is an aghost or some component hijack.
+/mob/proc/ghostize(can_reenter_corpse = TRUE, special = FALSE)
+	if(!key || cmptext(copytext(key,1,2),"@") || (!special && SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, can_reenter_corpse, special) & COMPONENT_BLOCK_GHOSTING))
+		return //mob has no key, is an aghost or some component hijacked.
 	stop_sound_channel(CHANNEL_HEARTBEAT) //Stop heartbeat sounds because You Are A Ghost Now
 	var/mob/dead/observer/ghost = new(src)	// Transfer safety to observer spawning proc.
 	SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
@@ -280,7 +280,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Ghost"
 	set desc = "Relinquish your life and enter the land of the dead."
 
-	if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, (stat == DEAD) ? TRUE : FALSE) & COMPONENT_BLOCK_GHOSTING)
+	if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, (stat == DEAD) ? TRUE : FALSE, FALSE) & COMPONENT_BLOCK_GHOSTING)
 		return
 
 // CITADEL EDIT
@@ -309,7 +309,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Ghost"
 	set desc = "Relinquish your life and enter the land of the dead."
 
-	if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, FALSE) & COMPONENT_BLOCK_GHOSTING)
+	if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, FALSE, FALSE) & COMPONENT_BLOCK_GHOSTING)
 		return
 
 	var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you won't be able to re-enter this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")

code/modules/mob/death.dm

@@ -11,4 +11,6 @@
 
 /mob/proc/death(gibbed)
 	SEND_SIGNAL(src, COMSIG_MOB_DEATH, gibbed)
+	if(!QDELETED(inception) && inception.parent)
+		inception.virtual_reality_in_a_virtual_reality(TRUE)
 	return

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -426,7 +426,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 				to_chat(G, "<span class='holoparasite'>Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.</span>")
 				to_chat(src, "<span class='holoparasite bold'>Your <font color=\"[G.namedatum.colour]\">[G.real_name]</font> has been successfully reset.</span>")
 				message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(G)])")
-				G.ghostize(FALSE, FALSE)
+				G.ghostize(FALSE)
 				G.setthemename(G.namedatum.theme) //give it a new color, to show it's a new person
 				C.transfer_key(G)
 				G.reset = 1

code/modules/mob/mob.dm

@@ -12,6 +12,8 @@
 			var/mob/dead/observe = M
 			observe.reset_perspective(null)
 	qdel(hud_used)
+	if(!QDELETED(inception) && inception.parent)
+		inception.virtual_reality_in_a_virtual_reality(TRUE)
 	for(var/cc in client_colours)
 		qdel(cc)
 	client_colours = null
@@ -438,7 +440,7 @@
 
 /mob/proc/transfer_key(mob/new_mob, send_signal = TRUE)
 	if(send_signal)
-		SEND_SIGNAL(src, COMSIG_MOB_KEY_CHANGE, new_mob)
+		SEND_SIGNAL(src, COMSIG_MOB_KEY_CHANGE, new_mob, src)
 	new_mob.key = key
 
 /mob/verb/cancel_camera()

code/modules/mob/mob_defines.dm

@@ -112,3 +112,5 @@
 	var/registered_z
 
 	var/mob/audiovisual_redirect //Mob to redirect messages, speech, and sounds to
+
+	var/datum/component/virtual_reality/inception

code/modules/mob/mob_helpers.dm

@@ -429,7 +429,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		var/mob/dead/observer/C = pick(candidates)
 		to_chat(M, "Your mob has been taken over by a ghost!")
 		message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(M)])")
-		M.ghostize(FALSE, FALSE)
+		M.ghostize(FALSE, TRUE)
 		C.transfer_key(M, FALSE)
 		return TRUE
 	else

code/modules/spells/spell_types/mind_transfer.dm

@@ -70,7 +70,7 @@ Also, you never added distance checking after target is selected. I've went ahea
 	var/mob/living/caster = user//The wizard/whomever doing the body transferring.
 
 	//MIND TRANSFER BEGIN
-	var/mob/dead/observer/ghost = victim.ghostize(FALSE, FALSE)
+	var/mob/dead/observer/ghost = victim.ghostize(FALSE, TRUE)
 	caster.mind.transfer_to(victim)
 
 	ghost.mind.transfer_to(caster)