Supply/scrubber upward pipes, downward pipes and pipe caps added.

code/ATMOSPHERICS/pipes.dm

@@ -979,10 +979,46 @@
 	level = 2
 	icon_state = "cap"
 
+/obj/machinery/atmospherics/pipe/cap/visible/scrubbers
+	name = "scrubbers pipe endcap"
+	desc = "An endcap for scrubbers pipes"
+	icon_state = "cap-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/cap/visible/supply
+	name = "supply pipe endcap"
+	desc = "An endcap for supply pipes"
+	icon_state = "cap-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
 /obj/machinery/atmospherics/pipe/cap/hidden
 	level = 1
 	icon_state = "cap-f"
 
+/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers
+	name = "scrubbers pipe endcap"
+	desc = "An endcap for scrubbers pipes"
+	icon_state = "cap-f-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/cap/hidden/supply
+	name = "supply pipe endcap"
+	desc = "An endcap for supply pipes"
+	icon_state = "cap-f-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
 
 /obj/machinery/atmospherics/pipe/tank
 	icon = 'icons/atmos/tank.dmi'

code/TriDimension/Pipes.dm

@@ -134,8 +134,12 @@ obj/machinery/atmospherics/pipe/zpipe/up/initialize()
 
 	for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
 		if(target.initialize_directions & get_dir(target,src))
-			node1 = target
+			var/c = check_connect_types(target,src)
-			break
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node1 = target
+				break
 
 	var/turf/controllerlocation = locate(1, 1, src.z)
 	for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
@@ -144,8 +148,12 @@ obj/machinery/atmospherics/pipe/zpipe/up/initialize()
 			if(above)
 				for(var/obj/machinery/atmospherics/target in above)
 					if(target.initialize_directions && istype(target, /obj/machinery/atmospherics/pipe/zpipe/down))
-						node2 = target
+						var/c = check_connect_types(target,src)
-						break
+						if (c)
+							target.connected_to = c
+							src.connected_to = c
+							node2 = target
+							break
 
 
 	var/turf/T = src.loc			// hide if turf is not intact
@@ -173,8 +181,12 @@ obj/machinery/atmospherics/pipe/zpipe/down/initialize()
 
 	for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
 		if(target.initialize_directions & get_dir(target,src))
-			node1 = target
+			var/c = check_connect_types(target,src)
-			break
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node1 = target
+				break
 
 	var/turf/controllerlocation = locate(1, 1, src.z)
 	for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
@@ -183,9 +195,53 @@ obj/machinery/atmospherics/pipe/zpipe/down/initialize()
 			if(below)
 				for(var/obj/machinery/atmospherics/target in below)
 					if(target.initialize_directions && istype(target, /obj/machinery/atmospherics/pipe/zpipe/up))
-						node2 = target
+						var/c = check_connect_types(target,src)
-						break
+						if (c)
+							target.connected_to = c
+							src.connected_to = c
+							node2 = target
+							break
 
 
 	var/turf/T = src.loc			// hide if turf is not intact
-	hide(T.intact)
+	hide(T.intact)
+
+///////////////////////
+// supply/scrubbers  //
+///////////////////////
+
+obj/machinery/atmospherics/pipe/zpipe/up/scrubbers
+	icon_state = "up-scrubbers"
+	name = "upwards scrubbers pipe"
+	desc = "A scrubbers pipe segment to connect upwards."
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+obj/machinery/atmospherics/pipe/zpipe/up/supply
+	icon_state = "up-supply"
+	name = "upwards supply pipe"
+	desc = "A supply pipe segment to connect upwards."
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+obj/machinery/atmospherics/pipe/zpipe/down/scrubbers
+	icon_state = "down-scrubbers"
+	name = "downwards scrubbers pipe"
+	desc = "A scrubbers pipe segment to connect downwards."
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+obj/machinery/atmospherics/pipe/zpipe/down/supply
+	icon_state = "down-supply"
+	name = "downwards supply pipe"
+	desc = "A supply pipe segment to connect downwards."
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE

code/game/machinery/pipe/construction.dm

@@ -42,6 +42,12 @@ Buildable meters
 #define PIPE_SCRUBBERS_MANIFOLD		34
 #define PIPE_SUPPLY_MANIFOLD4W		35
 #define PIPE_SCRUBBERS_MANIFOLD4W	36
+#define PIPE_SUPPLY_UP				37
+#define PIPE_SCRUBBERS_UP			38
+#define PIPE_SUPPLY_DOWN			39
+#define PIPE_SCRUBBERS_DOWN			40
+#define PIPE_SUPPLY_CAP				41
+#define PIPE_SCRUBBERS_CAP			42
 
 /obj/item/pipe
 	name = "pipe"
@@ -136,6 +142,14 @@ Buildable meters
 			src.color = PIPE_COLOR_RED
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w))
 			src.pipe_type = PIPE_MANIFOLD4W
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/cap/visible/supply) || istype(make_from, /obj/machinery/atmospherics/pipe/cap/hidden/supply))
+			src.pipe_type = PIPE_SUPPLY_CAP
+			connect_types = list(2)
+			src.color = PIPE_COLOR_BLUE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/cap/visible/scrubbers) || istype(make_from, /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers))
+			src.pipe_type = PIPE_SCRUBBERS_CAP
+			connect_types = list(3)
+			src.color = PIPE_COLOR_RED
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/cap))
 			src.pipe_type = PIPE_CAP
 		else if(istype(make_from, /obj/machinery/atmospherics/omni/mixer))
@@ -143,18 +157,34 @@ Buildable meters
 		else if(istype(make_from, /obj/machinery/atmospherics/omni/filter))
 			src.pipe_type = PIPE_OMNI_FILTER
 ///// Z-Level stuff
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/up/supply))
+			src.pipe_type = PIPE_SUPPLY_UP
+			connect_types = list(2)
+			src.color = PIPE_COLOR_BLUE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers))
+			src.pipe_type = PIPE_SCRUBBERS_UP
+			connect_types = list(3)
+			src.color = PIPE_COLOR_RED
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/up))
 			src.pipe_type = PIPE_UP
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/down/supply))
+			src.pipe_type = PIPE_SUPPLY_DOWN
+			connect_types = list(2)
+			src.color = PIPE_COLOR_BLUE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers))
+			src.pipe_type = PIPE_SCRUBBERS_DOWN
+			connect_types = list(3)
+			src.color = PIPE_COLOR_RED
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/down))
 			src.pipe_type = PIPE_DOWN
 ///// Z-Level stuff
 	else
 		src.pipe_type = pipe_type
 		src.dir = dir
-		if (pipe_type == 29 || pipe_type == 30 || pipe_type == 33 || pipe_type == 35)
+		if (pipe_type == 29 || pipe_type == 30 || pipe_type == 33 || pipe_type == 35 || pipe_type == 37 || pipe_type == 39 || pipe_type == 41)
 			connect_types = list(2)
 			src.color = PIPE_COLOR_BLUE
-		else if (pipe_type == 31 || pipe_type == 32 || pipe_type == 34 || pipe_type == 36)
+		else if (pipe_type == 31 || pipe_type == 32 || pipe_type == 34 || pipe_type == 36 || pipe_type == 38 || pipe_type == 40 || pipe_type == 42)
 			connect_types = list(3)
 			src.color = PIPE_COLOR_RED
 		else if (pipe_type == 28)
@@ -208,6 +238,12 @@ Buildable meters
 		"scrubbers manifold", \
 		"supply 4-way manifold", \
 		"scrubbers 4-way manifold", \
+		"supply pipe up", \
+		"scrubbers pipe up", \
+		"supply pipe down", \
+		"scrubbers pipe down", \
+		"supply pipe cap", \
+		"scrubbers pipe cap", \
 	)
 	name = nlist[pipe_type+1] + " fitting"
 	var/list/islist = list( \
@@ -251,6 +287,12 @@ Buildable meters
 		"manifold", \
 		"manifold4w", \
 		"manifold4w", \
+		"cap", \
+		"cap", \
+		"cap", \
+		"cap", \
+		"cap", \
+		"cap", \
 	)
 	icon_state = islist[pipe_type + 1]
 
@@ -333,10 +375,10 @@ Buildable meters
 			return dir|flip|acw
 		if(PIPE_GAS_MIXER_T)
 			return dir|cw|acw
-		if(PIPE_CAP)
+		if(PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP)
 			return flip
 ///// Z-Level stuff
-		if(PIPE_UP,PIPE_DOWN)
+		if(PIPE_UP,PIPE_DOWN,PIPE_SUPPLY_UP,PIPE_SUPPLY_DOWN,PIPE_SCRUBBERS_UP,PIPE_SCRUBBERS_DOWN)
 			return dir
 ///// Z-Level stuff
 	return 0
@@ -892,6 +934,26 @@ Buildable meters
 				C.node.initialize()
 				C.node.build_network()
 
+		if(PIPE_SUPPLY_CAP)
+			var/obj/machinery/atmospherics/pipe/cap/hidden/supply/C = new(src.loc)
+			C.dir = dir
+			C.initialize_directions = pipe_dir
+			C.initialize()
+			C.build_network()
+			if(C.node)
+				C.node.initialize()
+				C.node.build_network()
+
+		if(PIPE_SCRUBBERS_CAP)
+			var/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers/C = new(src.loc)
+			C.dir = dir
+			C.initialize_directions = pipe_dir
+			C.initialize()
+			C.build_network()
+			if(C.node)
+				C.node.initialize()
+				C.node.build_network()
+
 		if(PIPE_PASSIVE_GATE)		//passive gate
 			var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc)
 			P.dir = dir
@@ -972,6 +1034,70 @@ Buildable meters
 			if (P.node2)
 				P.node2.initialize()
 				P.node2.build_network()
+		if(PIPE_SUPPLY_UP)
+			var/obj/machinery/atmospherics/pipe/zpipe/up/supply/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+		if(PIPE_SUPPLY_DOWN)
+			var/obj/machinery/atmospherics/pipe/zpipe/down/supply/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+		if(PIPE_SCRUBBERS_UP)
+			var/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+		if(PIPE_SCRUBBERS_DOWN)
+			var/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
 ///// Z-Level stuff
 		if(PIPE_OMNI_MIXER)
 			var/obj/machinery/atmospherics/omni/mixer/P = new(loc)

code/game/machinery/pipe/pipe_dispenser.dm

@@ -23,18 +23,24 @@
 <A href='?src=\ref[src];make=20;dir=1'>Pipe Cap</A><BR>
 <A href='?src=\ref[src];make=19;dir=1'>4-Way Manifold</A><BR>
 <A href='?src=\ref[src];make=18;dir=1'>Manual T-Valve</A><BR>
-<A href='?src=\ref[src];make=21;dir=1'>upward Pipe</A><BR>
+<A href='?src=\ref[src];make=21;dir=1'>Upward Pipe</A><BR>
-<A href='?src=\ref[src];make=22;dir=1'>downward Pipe</A><BR>
+<A href='?src=\ref[src];make=22;dir=1'>Downward Pipe</A><BR>
 <b>Supply pipes:</b><BR>
 <A href='?src=\ref[src];make=29;dir=1'>Pipe</A><BR>
 <A href='?src=\ref[src];make=30;dir=5'>Bent Pipe</A><BR>
 <A href='?src=\ref[src];make=33;dir=1'>Manifold</A><BR>
+<A href='?src=\ref[src];make=41;dir=1'>Pipe Cap</A><BR>
 <A href='?src=\ref[src];make=35;dir=1'>4-Way Manifold</A><BR>
+<A href='?src=\ref[src];make=37;dir=1'>Upward Pipe</A><BR>
+<A href='?src=\ref[src];make=39;dir=1'>Downward Pipe</A><BR>
 <b>Scrubbers pipes:</b><BR>
 <A href='?src=\ref[src];make=31;dir=1'>Pipe</A><BR>
 <A href='?src=\ref[src];make=32;dir=5'>Bent Pipe</A><BR>
 <A href='?src=\ref[src];make=34;dir=1'>Manifold</A><BR>
+<A href='?src=\ref[src];make=42;dir=1'>Pipe Cap</A><BR>
 <A href='?src=\ref[src];make=36;dir=1'>4-Way Manifold</A><BR>
+<A href='?src=\ref[src];make=38;dir=1'>Upward Pipe</A><BR>
+<A href='?src=\ref[src];make=40;dir=1'>Downward Pipe</A><BR>
 <b>Devices:</b><BR>
 <A href='?src=\ref[src];make=28;dir=1'>Universal pipe adapter</A><BR>
 <A href='?src=\ref[src];make=4;dir=1'>Connector</A><BR>