cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Runtime station fixes (#25151)

Browse Source 
* Fixes spawning on runtimestation titlescreen

* Fix shuttle runtimes
This commit is contained in:
Cyberboss
2017-03-17 00:07:34 -03:00
committed by Leo
parent 8848d46b0c
commit c09d61ae79
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/jobs.dm
+1 -1
View File
@@ -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))
code/controllers/subsystem/shuttles.dm
+1 -1
View File
@@ -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