From c09d61ae799b399840723babcd597a1df2240a14 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 16 Mar 2017 23:07:34 -0400 Subject: [PATCH] Runtime station fixes (#25151) * Fixes spawning on runtimestation titlescreen * Fix shuttle runtimes --- _maps/map_files/debug/runtimestation.dmm | 2 +- code/controllers/subsystem/jobs.dm | 2 +- code/controllers/subsystem/shuttles.dm | 2 +- code/modules/shuttle/emergency.dm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 0e6c0e299d9..1a6183603c8 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -188,7 +188,7 @@ "dF" = (/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 5},/area/storage/primary) "dG" = (/obj/machinery/door/airlock,/turf/open/floor/plasteel,/area/storage/primary) "dH" = (/obj/effect/landmark/start,/turf/open/floor/plasteel,/area/storage/primary) -"dI" = (/obj/effect/landmark{name = "JoinLate"},/turf/open/floor/plasteel,/area/storage/primary) +"dI" = (/obj/effect/landmark/latejoin,/turf/open/floor/plasteel,/area/storage/primary) "dJ" = (/turf/open/floor/plasteel,/area/storage/primary) "dK" = (/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/corner{dir = 8},/area/construction) "dL" = (/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 1},/area/construction) diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 454663bae13..35577889c41 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -387,7 +387,7 @@ var/datum/controller/subsystem/job/SSjob break if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper log_world("Couldn't find a round start spawn point for [rank]") - S = pick(latejoin) + S = get_turf(pick(latejoin)) if(!S) //final attempt, lets find some area in the arrivals shuttle to spawn them in to. log_world("Couldn't find a round start latejoin spawn point.") for(var/turf/T in get_area_turfs(/area/shuttle/arrival)) diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 9077702f14f..dd6140f6ebd 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -238,7 +238,7 @@ var/datum/controller/subsystem/shuttle/SSshuttle return 1 /datum/controller/subsystem/shuttle/proc/canRecall() - if(emergency.mode != SHUTTLE_CALL) + if(!emergency || emergency.mode != SHUTTLE_CALL) return if(ticker.mode.name == "meteor") return diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index e612971ae44..7addfe25fe7 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -118,7 +118,7 @@ // Launch check is in process in case auth_need changes for some reason // probably external. . = FALSE - if(ENGINES_STARTED || (!IS_DOCKED)) + if(!SSshuttle.emergency || ENGINES_STARTED || (!IS_DOCKED)) return . // Check to see if we've reached criteria for early launch