From 2bd96ab29e83d276e91f1c8508f6963dded8f02e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 16 Aug 2014 20:50:34 -0400 Subject: [PATCH] Fixes multi docking port undocking conditions The undocking conditions for multidocking ports (used by the escape shuttle) were overly strict, failing if any door was open/unlocked. Changed to allow undocking if at least one of the inner or outer doors can close and lock. --- .../machinery/embedded_controller/docking_program_multi.dm | 4 +++- code/modules/shuttles/escape_pods.dm | 7 ------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/embedded_controller/docking_program_multi.dm b/code/game/machinery/embedded_controller/docking_program_multi.dm index 43906f9d5f..13b542ff05 100644 --- a/code/game/machinery/embedded_controller/docking_program_multi.dm +++ b/code/game/machinery/embedded_controller/docking_program_multi.dm @@ -197,7 +197,9 @@ //checks if we are ready for undocking /datum/computer/file/embedded_program/airlock/multi_docking/proc/ready_for_undocking() - return check_doors_secured() + var/ext_closed = check_exterior_door_secured() + var/int_closed = check_interior_door_secured() + return (ext_closed || int_closed) /datum/computer/file/embedded_program/airlock/multi_docking/proc/open_doors() toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index 7fe1d1c36c..dd7aafc67d 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -137,10 +137,3 @@ /datum/computer/file/embedded_program/docking/simple/escape_pod/prepare_for_undocking() eject_time = world.time + eject_delay*10 - -/* -/datum/computer/file/embedded_program/docking/simple/escape_pod/ready_for_undocking() - if (world.time < eject_time) - return 0 - return ..() -*/ \ No newline at end of file