mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 13:18:09 +01:00
[MIRROR] fixes some bad spawn handling (#12554)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
744ea0edbc
commit
0362e441ad
@@ -1,6 +1,5 @@
|
||||
///////////////////////////
|
||||
//// Spawning and despawning
|
||||
GLOBAL_LIST_EMPTY(latejoin_talon)
|
||||
/obj/effect/landmark/talon
|
||||
name = "JoinLateTalon"
|
||||
delete_me = 1
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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!
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
///////////////////////////
|
||||
//// Spawning and despawning
|
||||
GLOBAL_LIST_EMPTY(latejoin_talon)
|
||||
/obj/effect/landmark/talon
|
||||
name = "JoinLateTalon"
|
||||
delete_me = 1
|
||||
|
||||
Reference in New Issue
Block a user