shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks

Browse Source 
Fix cycle-linked airlocks on shuttles
This commit is contained in:
oranges
2018-04-19 20:14:46 +12:00
committed by CitadelStationBot
parent f98040513a
commit 20823c0c1b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/on_move.dm
+6 -6
View File
@@ -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)
. = ..()