From 0362e441adf47bc7ca7b26a76e4fa472ac52e0ec Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Thu, 19 Mar 2026 15:32:29 -0700
Subject: [PATCH] [MIRROR] fixes some bad spawn handling (#12554)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 archive/maps/submaps/depreciated_vr/talon.dm   | 1 -
 code/_global_vars/lists/mapping.dm             | 2 ++
 code/game/jobs/job_controller.dm               | 2 +-
 code/modules/client/preferences_spawnpoints.dm | 6 ++----
 code/modules/mob/new_player/new_player.dm      | 2 +-
 code/modules/tgui/modules/late_choices.dm      | 2 +-
 maps/offmap_vr/talon/talon_v2.dm               | 1 -
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/archive/maps/submaps/depreciated_vr/talon.dm b/archive/maps/submaps/depreciated_vr/talon.dm
index d8c95b70fa..54f7417742 100644
--- a/archive/maps/submaps/depreciated_vr/talon.dm
+++ b/archive/maps/submaps/depreciated_vr/talon.dm
@@ -1,6 +1,5 @@
 ///////////////////////////
 //// Spawning and despawning
-GLOBAL_LIST_EMPTY(latejoin_talon)
 /obj/effect/landmark/talon
 	name = "JoinLateTalon"
 	delete_me = 1
diff --git a/code/_global_vars/lists/mapping.dm b/code/_global_vars/lists/mapping.dm
index 8740b48b07..15f97b2d54 100644
--- a/code/_global_vars/lists/mapping.dm
+++ b/code/_global_vars/lists/mapping.dm
@@ -38,6 +38,8 @@ GLOBAL_LIST_EMPTY(wizardstart)
 GLOBAL_LIST_EMPTY(newplayer_start)
 
 GLOBAL_LIST_EMPTY(latejoin)
+GLOBAL_LIST_EMPTY(latejoin_talon)
+GLOBAL_LIST_EMPTY(latejoin_tram)
 GLOBAL_LIST_EMPTY(latejoin_gateway)
 GLOBAL_LIST_EMPTY(latejoin_elevator)
 GLOBAL_LIST_EMPTY(latejoin_cryo)
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index b79d43218c..1d42127ae7 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -976,7 +976,7 @@ GLOBAL_DATUM(job_master, /datum/controller/occupations)
 		.["carrier"] = item_carrier
 		.["vorgans"] = vorgans
 		.["itemtf"] = item_to_be
-	if(spawnpos && istype(spawnpos) && spawnpos.turfs.len)
+	if(spawnpos && istype(spawnpos) && length(spawnpos.turfs))
 		if(spawnpos.check_job_spawning(rank))
 			.["turf"] = spawnpos.get_spawn_position()
 			.["msg"] = spawnpos.msg
diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm
index 4d57130f5b..7ed14153b0 100644
--- a/code/modules/client/preferences_spawnpoints.dm
+++ b/code/modules/client/preferences_spawnpoints.dm
@@ -89,17 +89,15 @@ GLOBAL_LIST_INIT(spawntypes, populate_spawn_points())
 
 /obj/effect/landmark/arrivals
 	name = "JoinLateShuttle"
-	delete_me = 1
+	delete_me = TRUE
 
 /obj/effect/landmark/arrivals/Initialize(mapload)
 	GLOB.latejoin += loc
 	. = ..()
 
-GLOBAL_LIST_EMPTY(latejoin_tram)
-
 /obj/effect/landmark/tram
 	name = "JoinLateTram"
-	delete_me = 1
+	delete_me = TRUE
 
 /obj/effect/landmark/tram/Initialize(mapload)
 	GLOB.latejoin_tram += loc // There's no tram but you know whatever man!
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index e06a39ea1f..3ba389558b 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -222,7 +222,7 @@
 	return 1
 
 
-/mob/new_player/proc/AttemptLateSpawn(rank,var/spawning_at)
+/mob/new_player/proc/AttemptLateSpawn(rank)
 	if (src != usr)
 		return 0
 	if(!SSticker || SSticker.current_state != GAME_STATE_PLAYING)
diff --git a/code/modules/tgui/modules/late_choices.dm b/code/modules/tgui/modules/late_choices.dm
index acb4d05d14..c2f2b18d06 100644
--- a/code/modules/tgui/modules/late_choices.dm
+++ b/code/modules/tgui/modules/late_choices.dm
@@ -139,4 +139,4 @@
 				tgui_alert_async(new_user,"Your current species, [new_user.client.prefs.species], is not available for play on the station.")
 				return 0
 
-			new_user.AttemptLateSpawn(job, new_user.read_preference(/datum/preference/choiced/living/spawnpoint))
+			new_user.AttemptLateSpawn(job)
diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm
index 6586acc31c..e893587cfa 100644
--- a/maps/offmap_vr/talon/talon_v2.dm
+++ b/maps/offmap_vr/talon/talon_v2.dm
@@ -1,6 +1,5 @@
 ///////////////////////////
 //// Spawning and despawning
-GLOBAL_LIST_EMPTY(latejoin_talon)
 /obj/effect/landmark/talon
 	name = "JoinLateTalon"
 	delete_me = 1