diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index 075f3c079df..7c24d564033 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -500,7 +500,7 @@
 			Debug("EP/([H]): Abort, H is AI.")
 			return EquipRank(H, rank, 1)
 
-	if(!current_map.command_spawn_enabled || spawning_at != "Arrivals Shuttle" && spawning_at != "Cryogenic Storage")
+	if(!current_map.command_spawn_enabled || spawning_at != "Arrivals Shuttle" && spawning_at != "Cryogenic Storage"  && spawning_at != "Living Quarters Lift")
 		return EquipRank(H, rank, 1)
 
 	H.centcomm_despawn_timer = addtimer(CALLBACK(H, /mob/living/.proc/centcomm_timeout), 10 MINUTES, TIMER_STOPPABLE)
@@ -509,7 +509,7 @@
 
 	H.job = rank
 
-	if(spawning_at != "Arrivals Shuttle" && spawning_at != "Cryogenic Storage" || job.latejoin_at_spawnpoints)
+	if(spawning_at != "Arrivals Shuttle" && spawning_at != "Cryogenic Storage" && spawning_at != "Living Quarters Lift" || job.latejoin_at_spawnpoints)
 		return EquipRank(H, rank, 1)
 
 	var/list/spawn_in_storage = list()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index d3189fa97cd..b64f5575600 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -483,8 +483,8 @@ var/global/list/frozen_crew = list()
 			to_chat(user, SPAN_NOTICE("You stop [L == user ? "climbing into" : "putting [L] into"] \the [name]."))
 			return
 
-		to_chat(L, SPAN_NOTICE("You feel cool air surround you. You go numb as your senses turn inward."))
-		to_chat(L, SPAN_DANGER("Press Ghost in the OOC tab to cryo, your character will shortly be removed from the round and the slot you occupy will be freed."))
+		to_chat(L, SPAN_NOTICE("[on_enter_occupant_message]"))
+		to_chat(L, SPAN_DANGER("Press Ghost in the OOC tab to leave, your character will shortly be removed from the round and the slot you occupy will be freed."))
 		set_occupant(L)
 		update_icon()
 
@@ -555,7 +555,7 @@ var/global/list/frozen_crew = list()
 		update_icon()
 
 		to_chat(usr, SPAN_NOTICE("[on_enter_occupant_message]"))
-		to_chat(usr, SPAN_DANGER("Press Ghost in the OOC tab to cryo, your character will shortly be removed from the round and the slot you occupy will be freed."))
+		to_chat(usr, SPAN_DANGER("Press Ghost in the OOC tab to leave, your character will shortly be removed from the round and the slot you occupy will be freed."))
 
 		if(isipc(usr))
 			var/choice = alert(usr, "Would you like to save your tag data?", "Tag Persistence", "Yes", "No")
diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm
index c5451b3379f..70431f01cd5 100644
--- a/code/modules/client/preferences_spawnpoints.dm
+++ b/code/modules/client/preferences_spawnpoints.dm
@@ -60,10 +60,21 @@
 	turfs = latejoin_cyborg
 
 /datum/spawnpoint/living_quarters_lift
-	display_name = "Arrivals Shuttle"
+	display_name = "Living Quarters Lift"
 	msg = "is inbound from the living quarters"
 	disallow_job = list("Cyborg", "Merchant")
 
 /datum/spawnpoint/living_quarters_lift/New()
 	..()
-	turfs = latejoin_living_quarters_lift
\ No newline at end of file
+	turfs = latejoin_living_quarters_lift
+
+/datum/spawnpoint/living_quarters_lift/after_join(mob/victim)
+	if(!istype(victim))
+		return
+	var/area/A = get_area(victim)
+	for(var/obj/machinery/cryopod/living_quarters/C in A)
+		if(!C.occupant)
+			C.set_occupant(victim, 1)
+			to_chat(victim, SPAN_NOTICE("You have arrived from the living quarters aboard the [current_map.full_name]."))
+			to_chat(victim, FONT_LARGE("<b>Your workplace attire is waiting for you at the nearest autodrobe vendor.</b>"))
+			return
diff --git a/maps/placeholder/code/placeholder.dm b/maps/placeholder/code/placeholder.dm
index fefa5140045..2d5ea331acc 100644
--- a/maps/placeholder/code/placeholder.dm
+++ b/maps/placeholder/code/placeholder.dm
@@ -80,7 +80,7 @@
 
 	evac_controller_type = /datum/evacuation_controller/starship
 
-	allowed_spawns = list("Living Quarters Lift","Cryogenic Storage", "Cyborg Storage")
+	spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo, /datum/spawnpoint/cyborg)
 
 /datum/map/placeholder/finalize_load()
 	// generate an empty space Z