From 20823c0c1b518fc9c106ac0e54b0674e1ea501fb Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 19 Apr 2018 20:14:46 +1200 Subject: [PATCH] Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks Fix cycle-linked airlocks on shuttles --- code/modules/shuttle/on_move.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index ec596e31a1..d0ae11046d 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -156,17 +156,17 @@ All ShuttleMove procs go here /obj/machinery/door/airlock/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) . = ..() - shuttledocked = 0 - for(var/obj/machinery/door/airlock/A in range(1, src)) - A.shuttledocked = 0 + for(var/obj/machinery/door/airlock/A in range(1, src)) // includes src + A.shuttledocked = FALSE A.air_tight = TRUE INVOKE_ASYNC(A, /obj/machinery/door/.proc/close) /obj/machinery/door/airlock/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() - shuttledocked = 1 - for(var/obj/machinery/door/airlock/A in range(1, src)) - A.shuttledocked = 1 + for(var/obj/machinery/door/airlock/A in orange(1, src)) // does not include src + // Cycle linking is only disabled if we are actually adjacent to another airlock + shuttledocked = TRUE + A.shuttledocked = TRUE /obj/machinery/camera/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) . = ..()