From d0636cd60841267fed337d5677ce0604e88ae907 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sun, 30 Mar 2025 15:49:56 -0700 Subject: [PATCH] [MIRROR] fix admin spawn or error (#10552) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- archive/maps/old_yw/tether_better/tether_things.dm | 4 ++-- archive/maps/old_yw/yw/cryogaia_things.dm | 4 ++-- archive/maps/old_yw/yw/residential/_residential.dm | 4 ++-- code/game/jobs/job_controller.dm | 4 ++-- code/game/objects/effects/landmarks.dm | 12 +++--------- code/modules/admin/verbs/randomverbs.dm | 8 +++++++- code/modules/vore/eating/belly_obj_vr.dm | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/archive/maps/old_yw/tether_better/tether_things.dm b/archive/maps/old_yw/tether_better/tether_things.dm index ee3cbe955d..0a628f913c 100644 --- a/archive/maps/old_yw/tether_better/tether_things.dm +++ b/archive/maps/old_yw/tether_better/tether_things.dm @@ -266,10 +266,10 @@ var/global/list/latejoin_tram = list() name = "JoinLateTram" delete_me = 1 -/obj/effect/landmark/tram/New() +/obj/effect/landmark/tram/Initialize(mapload) latejoin_tram += loc // Register this turf as tram latejoin. latejoin += loc // Also register this turf as fallback latejoin, since we won't have any arrivals shuttle landmarks. - ..() + . = ..() /datum/spawnpoint/tram display_name = "Tram Station" diff --git a/archive/maps/old_yw/yw/cryogaia_things.dm b/archive/maps/old_yw/yw/cryogaia_things.dm index a2d13c65d4..3def925f78 100644 --- a/archive/maps/old_yw/yw/cryogaia_things.dm +++ b/archive/maps/old_yw/yw/cryogaia_things.dm @@ -204,10 +204,10 @@ var/global/list/latejoin_tram = list() name = "JoinLateTram" delete_me = 1 -/obj/effect/landmark/tram/New() +/obj/effect/landmark/tram/Initialize(mapload) latejoin_tram += loc // Register this turf as tram latejoin. latejoin += loc // Also register this turf as fallback latejoin, since we won't have any arrivals shuttle landmarks. - ..() + . = ..() /datum/spawnpoint/tram display_name = "Tram Station" diff --git a/archive/maps/old_yw/yw/residential/_residential.dm b/archive/maps/old_yw/yw/residential/_residential.dm index 620b93f92c..a327f9da09 100644 --- a/archive/maps/old_yw/yw/residential/_residential.dm +++ b/archive/maps/old_yw/yw/residential/_residential.dm @@ -63,9 +63,9 @@ var/global/list/latejoin_residential = list() name = "JoinLateResidential" delete_me = 1 -/obj/effect/landmark/residential/New() +/obj/effect/landmark/residential/Initialize(mapload) latejoin_residential += loc // Register this turf as tram latejoin. - ..() + . = ..() /datum/spawnpoint/residential display_name = "NCS Serenity Residential" diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 3a5e7adf46..4ae28c6a82 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -977,11 +977,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"] = get_turf(spawning) + .["turf"] = spawning .["msg"] = "will arrive at the station shortly" else if(!fail_deadly) var/spawning = pick(latejoin) - .["turf"] = get_turf(spawning) + .["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 8f9c9f6328..ef35240bee 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -21,19 +21,13 @@ newplayer_start += loc delete_me = TRUE if("JoinLate") // Bit difference, since we need the spawn point to move. - latejoin += src - simulated = TRUE - // delete_me = 1 - //VOREStation Add end - if("Observer-Start") // Ghosts are the only thing that use the latejoin list afaik and it complains if there's nothing in the list. - latejoin += src - simulated = TRUE + latejoin += loc + delete_me = TRUE //VOREStation Add end if("JoinLateGateway") latejoin_gateway += loc - // CHOMPEdit Start + // latejoin += loc //VOREStation Addition // CHOMPRemove delete_me = TRUE - // CHOMPEdit End //CHOMPEdit Begin if("JoinLateStationGateway") GLOB.latejoin_gatewaystation += loc diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 9cc8840256..6052b6583e 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -485,7 +485,13 @@ Traitors and the like can also be revived with the previous role mostly intact. return if("Arrivals") //Spawn them at a latejoin spawnpoint - spawnloc = pick(latejoin) + if(LAZYLEN(latejoin)) + spawnloc = pick(latejoin) + else if(LAZYLEN(latejoin_tram)) + spawnloc = pick(latejoin_tram) + else + to_chat(src, "This map has no latejoin spawnpoint.") + return else //I have no idea how you're here to_chat(src, "Invalid spawn location choice.") diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 9a1ff260b7..47368fbc75 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 get_turf(fallback) + return fallback //Yes, it's ""safe"" to drop items here /obj/belly/AllowDrop()