Merge pull request #6086 from tigercat2000/shuttle_hijack

Hijacking a shuttle diverts it to the syndicate outpost
This commit is contained in:
Fox McCloud
2017-02-08 10:05:34 -05:00
committed by GitHub
6 changed files with 213 additions and 175 deletions
+8 -2
View File
@@ -489,8 +489,14 @@
// Instead of spending a lot of time trying to work out where to place
// our shuttle, just create it somewhere empty and send it to where
// it should go
var/obj/docking_port/stationary/D = findRoundstartDock()
return dock(D)
. = dock_id(roundstart_move)
/obj/docking_port/mobile/proc/dock_id(id)
var/port = shuttle_master.getDock(id)
if(port)
. = dock(port)
else
. = null
/obj/effect/landmark/shuttle_import
name = "Shuttle Import"