mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 12:37:50 +01:00
fixes some bad spawn handling (#19315)
This commit is contained in:
@@ -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!
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user