cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes some bad spawn handling (#19315)

Browse Source
This commit is contained in:
Kashargul
2026-03-19 23:12:02 +01:00
committed by GitHub
parent 21efe0d9c5
commit ad5a08fd0e
7 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
archive/maps/submaps/depreciated_vr/talon.dm
-1
View File
@@ -1,6 +1,5 @@
///////////////////////////
//// Spawning and despawning
GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/effect/landmark/talon
name = "JoinLateTalon"
delete_me = 1
code/_global_vars/lists/mapping.dm
+2
View File
@@ -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)
code/game/jobs/job_controller.dm
+1 -1
View File
@@ -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
code/modules/client/preferences_spawnpoints.dm
+2 -4
View File
@@ -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!
code/modules/mob/new_player/new_player.dm
+1 -1
View File
@@ -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)
code/modules/tgui/modules/late_choices.dm
+1 -1
View File
@@ -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)
maps/offmap_vr/talon/talon_v2.dm
-1
View File
@@ -1,6 +1,5 @@
///////////////////////////
//// Spawning and despawning
GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/effect/landmark/talon
name = "JoinLateTalon"
delete_me = 1