diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 670a75df8f..466ab1fdc7 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -10,7 +10,7 @@ /obj/structure/signpost/attack_hand(mob/user as mob) if(tgui_alert(user, "Travel back to ss13?","Return?",list("Yes","No")) == "Yes") if(user.z != src.z) return - user.forceMove(pick(latejoin)) + user.forceMove(get_turf(pick(latejoin))) /obj/structure/signpost_fake icon = 'icons/obj/stationobjs.dmi' diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index f3168829af..d6e0e25369 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -969,11 +969,11 @@ var/global/datum/controller/occupations/job_master return to_chat(C, span_filter_warning("Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")) var/spawning = pick(latejoin) - .["turf"] = spawning + .["turf"] = get_turf(spawning) .["msg"] = "will arrive at the station shortly" else if(!fail_deadly) var/spawning = pick(latejoin) - .["turf"] = spawning + .["turf"] = get_turf(spawning) .["msg"] = "has arrived on the station" /datum/controller/occupations/proc/m_backup_client(var/client/C) //Same as m_backup, but takes a client entry. Used for vore late joining. diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index c9a134b598..43a4a87240 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -21,8 +21,9 @@ newplayer_start += loc delete_me = TRUE if("JoinLate") // Bit difference, since we need the spawn point to move. - latejoin += loc - delete_me = TRUE + latejoin += src + simulated = TRUE + //delete_me = TRUE // see above, moving, always use this list with get_turf if("JoinLateGateway") latejoin_gateway += loc latejoin += loc //VOREStation Addition diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 48287ef138..c7234fe272 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1033,7 +1033,7 @@ var/datum/announcement/minor/admin_min_announcer = new set name = "Unprison" if (M.z == 2) if (CONFIG_GET(flag/allow_admin_jump)) - M.loc = pick(latejoin) + M.loc = get_turf(pick(latejoin)) message_admins("[key_name_admin(usr)] has unprisoned [key_name_admin(M)]", 1) log_admin("[key_name(usr)] has unprisoned [key_name(M)]") else diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c5cdfb638b..1fca5bd64a 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -486,7 +486,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if("Arrivals") //Spawn them at a latejoin spawnpoint if(LAZYLEN(latejoin)) - spawnloc = pick(latejoin) + spawnloc = get_turf(pick(latejoin)) else if(LAZYLEN(latejoin_tram)) spawnloc = pick(latejoin_tram) else diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 950af3d629..81f229c8e5 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -132,7 +132,7 @@ default_pixel_x = body.default_pixel_x default_pixel_y = body.default_pixel_y if(!T && length(latejoin)) - T = pick(latejoin) //Safety in case we cannot find the body's position + T = get_turf(pick(latejoin)) //Safety in case we cannot find the body's position if(T) forceMove(T, just_spawned = TRUE) else diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 4fba837f5b..67d8ed751a 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -1213,7 +1213,7 @@ else log_debug("[src] (\ref[src]) doesn't have an owner, and dropped someone at a latespawn point!") var/fallback = pick(latejoin) - return fallback + return get_turf(fallback) //Yes, it's ""safe"" to drop items here /obj/belly/AllowDrop()