Allows pod to be launched if shuttle leaves early

This commit is contained in:
mwerezak
2014-08-01 01:00:21 -04:00
committed by ZomgPonies
parent 929e3fb1fd
commit 9cad0d5a16
+6 -3
View File
@@ -2,7 +2,7 @@
var/datum/computer/file/embedded_program/docking/simple/escape_pod/arming_controller
/datum/shuttle/ferry/escape_pod/can_launch()
if(arming_controller && !arming_controller.armed)
if(arming_controller && !arming_controller.armed) //must be armed
return 0
if(location)
return 0 //it's a one-way trip.
@@ -30,7 +30,7 @@
"override_enabled" = docking_program.override_enabled,
"door_state" = docking_program.memory["door_status"]["state"],
"door_lock" = docking_program.memory["door_status"]["lock"],
"can_force" = pod.can_force(),
"can_force" = pod.can_force() || (emergency_shuttle.departed && pod.can_launch()), //allow players to manually launch ahead of time if the shuttle leaves
"is_armed" = pod.arming_controller.armed,
)
@@ -49,7 +49,10 @@
if("manual_arm")
pod.arming_controller.arm()
if("force_launch")
pod.force_launch(src)
if (pod.can_force())
pod.force_launch(src)
else if (emergency_shuttle.departed && pod.can_launch()) //allow players to manually launch ahead of time if the shuttle leaves
pod.launch(src)
return 0