shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564

Browse Source 
[MIRROR] Shuttle engines affecting travel time
This commit is contained in:
LetterJay
2017-06-26 09:00:54 -05:00
committed by GitHub
parent 7d7078e7a6 165e684e9b
commit 028752c3de
10 changed files with 209 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttle.dm
+6 -1
View File
@@ -47,7 +47,7 @@ SUBSYSTEM_DEF(shuttle)
var/lockdown = FALSE //disallow transit after nuke goes off
var/auto_call = 99000 //time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.
var/auto_call = 99000 //time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.
/datum/controller/subsystem/shuttle/Initialize(timeofday)
if(!arrivals)
@@ -544,3 +544,8 @@ SUBSYSTEM_DEF(shuttle)
for(var/obj/docking_port/mobile/M in mobile)
if(M.is_in_shuttle_bounds(A))
return TRUE
/datum/controller/subsystem/shuttle/proc/get_containing_shuttle(atom/A)
for(var/obj/docking_port/mobile/M in mobile)
if(M.is_in_shuttle_bounds(A))
return M
code/controllers/subsystem/shuttle.dm.rej
+9
View File
@@ -0,0 +1,9 @@
diff a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm (rejected hunks)
@@ -536,3 +536,7 @@ SUBSYSTEM_DEF(shuttle)
if(M.is_in_shuttle_bounds(A))
return TRUE
+/datum/controller/subsystem/shuttle/proc/get_containing_shuttle(atom/A)
+ for(var/obj/docking_port/mobile/M in mobile)
+ if(M.is_in_shuttle_bounds(A))
+ return M