From 5d7cfcb67113167fa2627a0ea93ac59321f8b113 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 6 Feb 2017 00:32:42 -0500 Subject: [PATCH] Fixes various networks traversing transit space (#23711) * Fixes hyperspace transversing atmos machinery * Fixes hyperspace transversing powernets * Fixes hyperspace transversing disposal networks * Moves a define * Remove /obj/structure/disposalpipe/onShuttleMove * Forgot this part --- code/modules/shuttle/on_move.dm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index ee88e2e79cc..b2dbd4f04f6 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -11,6 +11,21 @@ return 0 . = ..() +/obj/machinery/atmospherics/onShuttleMove() + . = ..() + for(DEVICE_TYPE_LOOP) + if(get_area(nodes[I]) != get_area(src)) + nullifyNode(I) + +#define DIR_CHECK_TURF_AREA(X) (get_area(get_ranged_target_turf(src, X, 1)) != A) +/obj/structure/cable/onShuttleMove() + . = ..() + var/A = get_area(src) + //cut cables on the edge + if(DIR_CHECK_TURF_AREA(NORTH) || DIR_CHECK_TURF_AREA(SOUTH) || DIR_CHECK_TURF_AREA(EAST) || DIR_CHECK_TURF_AREA(WEST)) + cut_cable_from_powernet() +#undef DIR_CHECK_TURF_AREA + /atom/movable/light/onShuttleMove() return 0