diff --git a/archive/maps/submaps/depreciated_vr/talon.dm b/archive/maps/submaps/depreciated_vr/talon.dm index d8c95b70fa3..54f7417742c 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 8740b48b071..15f97b2d54f 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 a0e09aa9ded..db670d19b1d 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -960,7 +960,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 2b0ad8a1a91..1fd30f6ef0e 100644 --- a/code/modules/client/preferences_spawnpoints.dm +++ b/code/modules/client/preferences_spawnpoints.dm @@ -86,17 +86,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 c2260011f33..f22d25ee152 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -215,7 +215,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 cb1c6f92023..20de36e48fc 100644 --- a/code/modules/tgui/modules/late_choices.dm +++ b/code/modules/tgui/modules/late_choices.dm @@ -134,4 +134,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 6586acc31c9..e893587cfa0 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