cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40092 from AutomaticFrenzy/patch/cycle-link

Browse Source 
Fix double-wide shuttle airlocks losing their cycle-link
This commit is contained in:
Jordan Brown
2018-09-06 01:19:30 -04:00
committed by GitHub
parent bbefd047a3 f2f46060d7
commit 07040f8727
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/on_move.dm
+5 -3
View File
@@ -183,10 +183,12 @@ All ShuttleMove procs go here
/obj/machinery/door/airlock/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
var/current_area = get_area(src)
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
if(get_area(A) != current_area) // does not include double-wide airlocks unless actually docked
// 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)
. = ..()
code/modules/shuttle/shuttle_rotate.dm
+4 -2
View File
@@ -106,9 +106,11 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
/obj/machinery/door/airlock/shuttleRotate(rotation, params)
. = ..()
if(cyclelinkeddir)
if(cyclelinkeddir && (params & ROTATE_DIR))
cyclelinkeddir = angle2dir(rotation+dir2angle(cyclelinkeddir))
cyclelinkairlock()
// If we update the linked airlock here, the partner airlock might
// not be present yet, so don't do that. Just assume we're still
// partnered with the same airlock as before.
/obj/machinery/porta_turret/shuttleRotate(rotation, params)
. = ..()