made storage tanks connect from top/bottom, made storage tank and pipe

textures use the ^ combine operator so they can show the actual liquid going
through the pipes/tanks.

autoplace.lua

@@ -171,14 +171,23 @@ function pipes_scansurroundings(pos)
 		pzp=1
 	end
 
--- ...pumps, grates, and storage tanks
+-- ...pumps, grates...
 
-	if (string.find(nym.name, "pipeworks:storage_tank_") ~= nil) or
-	   (string.find(nym.name, "pipeworks:grating") ~= nil) or
+	if (string.find(nym.name, "pipeworks:grating") ~= nil) or
 	   (string.find(nym.name, "pipeworks:pump") ~= nil) then
 		pym=1
 	end
 
+-- ... and storage tanks.
+
+	if (string.find(nym.name, "pipeworks:storage_tank_") ~= nil) then
+		pym=1
+	end
+
+	if (string.find(nyp.name, "pipeworks:storage_tank_") ~= nil) then
+		pyp=1
+	end
+
 -- ...extra devices specified via the function's parameters
 -- ...except that this part is not implemented yet
 --

devices.lua

@@ -291,7 +291,7 @@ for fill = 0, 10 do
 			"pipeworks_storage_tank_back.png",
 			"pipeworks_storage_tank_back.png",
 			"pipeworks_storage_tank_back.png",
-			"pipeworks_storage_tank_front_"..fill..".png"
+			pipeworks_liquid_texture.."^pipeworks_storage_tank_front_"..fill..".png"
 		},
 		paramtype = "light",
 		paramtype2 = "facedir",
@@ -316,12 +316,12 @@ for fill = 0, 10 do
 	minetest.register_node("pipeworks:storage_tank_"..fill, {
 		description = "Fluid Storage Tank ("..filldesc..")",
 		tiles = {
+			"pipeworks_storage_tank_fittings.png",
 			"pipeworks_storage_tank_fittings.png",
 			"pipeworks_storage_tank_back.png",
 			"pipeworks_storage_tank_back.png",
 			"pipeworks_storage_tank_back.png",
-			"pipeworks_storage_tank_back.png",
-			"pipeworks_storage_tank_front_"..fill..".png"
+			pipeworks_liquid_texture.."^pipeworks_storage_tank_front_"..fill..".png"
 		},
 		paramtype = "light",
 		paramtype2 = "facedir",

init.lua

@@ -15,6 +15,8 @@
 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 local DEBUG = true
 
+pipeworks_liquid_texture = "default_water.png"
+
 pipe_leftstub = {
 	{ -32/64, -2/64, -6/64,   1/64, 2/64, 6/64 },	-- pipe segment against -X face
 	{ -32/64, -4/64, -5/64,   1/64, 4/64, 5/64 },
@@ -198,27 +200,27 @@ for zp = 0, 1 do
 	if (jx+jy+jz) == 1 then
 		if xm == 1 then 
 			table.remove(outimgs, 3)
-			table.insert(outimgs, 3, "pipeworks_pipe_end_XXXXX.png")
+			table.insert(outimgs, 3, "^pipeworks_plain.png")
 		end
 		if xp == 1 then 
 			table.remove(outimgs, 4)
-			table.insert(outimgs, 4, "pipeworks_pipe_end_XXXXX.png")
+			table.insert(outimgs, 4, "^pipeworks_plain.png")
 		end
 		if ym == 1 then 
 			table.remove(outimgs, 1)
-			table.insert(outimgs, 1, "pipeworks_pipe_end_XXXXX.png")
+			table.insert(outimgs, 1, "^pipeworks_plain.png")
 		end
 		if xp == 1 then 
 			table.remove(outimgs, 2)
-			table.insert(outimgs, 2, "pipeworks_pipe_end_XXXXX.png")
+			table.insert(outimgs, 2, "^pipeworks_plain.png")
 		end
 		if zm == 1 then 
 			table.remove(outimgs, 5)
-			table.insert(outimgs, 5, "pipeworks_pipe_end_XXXXX.png")
+			table.insert(outimgs, 5, "^pipeworks_plain.png")
 		end
 		if zp == 1 then 
 			table.remove(outimgs, 6)
-			table.insert(outimgs, 6, "pipeworks_pipe_end_XXXXX.png")
+			table.insert(outimgs, 6, "^pipeworks_plain.png")
 		end
 	end
 
@@ -229,15 +231,15 @@ for zp = 0, 1 do
 	if (jx==2 and jy~=2 and jz~=2) then
 		table.remove(outimgs, 5)
 		table.remove(outimgs, 5)
-		table.insert(outimgs, 5, "pipeworks_windowed_XXXXX.png")
-		table.insert(outimgs, 5, "pipeworks_windowed_XXXXX.png")
+		table.insert(outimgs, 5, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
+		table.insert(outimgs, 5, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
 	end
 
 	if (jx~=2 and jy~=2 and jz==2) or (jx~=2 and jy==2 and jz~=2) then
 		table.remove(outimgs, 3)
 		table.remove(outimgs, 3)
-		table.insert(outimgs, 3, "pipeworks_windowed_XXXXX.png")
-		table.insert(outimgs, 3, "pipeworks_windowed_XXXXX.png")
+		table.insert(outimgs, 3, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
+		table.insert(outimgs, 3, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
 	end
 
 	local pname = xm..xp..ym..yp..zm..zp