From 34457953cbd8f3eef8da0c76da60139543f25beb Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 1 May 2019 20:55:25 -0400 Subject: [PATCH] Ports https://github.com/PolarisSS13/Polaris/pull/6147 --- code/controllers/emergency_shuttle_controller.dm | 14 ++++++++++++-- code/modules/shuttles/escape_pods.dm | 2 -- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 5dbfeb427ac..2229c4febc5 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -35,7 +35,12 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle if (!shuttle.location) //leaving from the station //launch the pods! - for (var/datum/shuttle/ferry/escape_pod/pod in escape_pods) + for (var/EP in escape_pods) + var/datum/shuttle/ferry/escape_pod/pod + if(istype(escape_pods[EP], /datum/shuttle/ferry/escape_pod)) + pod = escape_pods[EP] + else + continue if (!pod.arming_controller || pod.arming_controller.armed) pod.launch(src) @@ -57,7 +62,12 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle //arm the escape pods if (evac) - for (var/datum/shuttle/ferry/escape_pod/pod in escape_pods) + for (var/EP in escape_pods) + var/datum/shuttle/ferry/escape_pod/pod + if(istype(escape_pods[EP], /datum/shuttle/ferry/escape_pod)) + pod = escape_pods[EP] + else + continue if (pod.arming_controller) pod.arming_controller.arm() diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index 96ba7c76888..60c1e4bd0d0 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -150,10 +150,8 @@ /datum/computer/file/embedded_program/docking/simple/escape_pod/ready_for_docking() return 1 -/* VOREStation Removal /datum/computer/file/embedded_program/docking/simple/escape_pod/finish_docking() return //don't do anything - the doors only open when the pod is armed. -*/ /datum/computer/file/embedded_program/docking/simple/escape_pod/prepare_for_undocking() eject_time = world.time + eject_delay*10