From 327c1e04e0717f152339f3411cc29c609c3ecf36 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 15 Jan 2020 22:00:08 -0700 Subject: [PATCH] s --- .../atmospherics/machinery/pipes/simple.dm | 46 +++++++++---------- .../network_builder/atmos_pipe.dm | 10 +++- .../network_builder/power_cables.dm | 2 +- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm index dbe67a1594..7cab3c23dc 100644 --- a/code/modules/atmospherics/machinery/pipes/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/simple.dm @@ -35,7 +35,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/general/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/general/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -58,7 +58,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/scrubbers name="scrubbers pipe" pipe_color=rgb(255,0,0) @@ -77,7 +77,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden level = PIPE_HIDDEN_LEVEL @@ -90,7 +90,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/supply name="air supply pipe" pipe_color=rgb(0,0,255) @@ -99,7 +99,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/supply/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/supply/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -122,7 +122,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/supplymain name="main air supply pipe" pipe_color=rgb(130,43,255) @@ -141,7 +141,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/supplymain/hidden level = PIPE_HIDDEN_LEVEL @@ -154,7 +154,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/yellow pipe_color=rgb(255,198,0) color=rgb(255,198,0) @@ -172,7 +172,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/yellow/hidden level = PIPE_HIDDEN_LEVEL @@ -185,7 +185,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/cyan pipe_color=rgb(0,255,249) color=rgb(0,255,249) @@ -193,7 +193,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/cyan/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -206,7 +206,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/cyan/hidden level = PIPE_HIDDEN_LEVEL - + /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -224,7 +224,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/green/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/green/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -237,7 +237,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/green/hidden level = PIPE_HIDDEN_LEVEL - + /obj/machinery/atmospherics/pipe/simple/green/hidden/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -255,7 +255,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/orange/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/orange/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -268,7 +268,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/orange/hidden level = PIPE_HIDDEN_LEVEL - + /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -286,7 +286,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/purple/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/purple/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -309,7 +309,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/dark pipe_color=rgb(69,69,69) color=rgb(69,69,69) @@ -317,7 +317,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/dark/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/dark/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -340,7 +340,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/violet pipe_color=rgb(64,0,128) color=rgb(64,0,128) @@ -348,7 +348,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/violet/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/violet/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -371,7 +371,7 @@ The regular pipe you see everywhere, including bent ones. piping_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X pixel_y = PIPING_LAYER_P_Y - + /obj/machinery/atmospherics/pipe/simple/brown pipe_color=rgb(178,100,56) color=rgb(178,100,56) @@ -379,7 +379,7 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/brown/visible level = PIPE_VISIBLE_LEVEL layer = GAS_PIPE_VISIBLE_LAYER - + /obj/machinery/atmospherics/pipe/simple/brown/visible/layer1 piping_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X diff --git a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm b/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm index 5926fd6760..8dc7043aea 100644 --- a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm +++ b/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm @@ -52,7 +52,7 @@ if(found) continue for(var/obj/machinery/atmospherics/A in T) - if((A.piping_layer == pipe_layer) && (A.initialize_directions & i)) + if((A.piping_layer == pipe_layer) && (A.initialize_directions & turn(i, 180))) network_directions += i break return network_directions @@ -65,7 +65,13 @@ switch(length(network_directions)) if(2) //straight pipe built = new /obj/machinery/atmospherics/pipe/simple(loc) - built.setDir(network_directions[1] | network_directions[2]) + var/d1 = network_directions[1] + var/d2 = network_directions[2] + var/combined = d1 | d2 + if(combined in GLOB.diagonals) + built.setDir(combined) + else + built.setDir(d1) if(3) //manifold var/list/missing = network_directions ^ GLOB.cardinals missing = missing[1] diff --git a/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm b/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm index d483a885ea..e26f1d314c 100644 --- a/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm +++ b/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm @@ -57,7 +57,7 @@ else var/do_knot = (knot == KNOT_FORCED) || ((knot == KNOT_AUTO) && should_auto_knot()) var/dirs = length(network_directions) - for(var/i in 1 to dirs) + for(var/i in 1 to dirs - 1) var/li = (i == 1)? dirs : (i - 1) var/d1 = network_directions[i] var/d2 = network_directions[li]