diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png
new file mode 100644
index 0000000000..04eca38d45
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png
new file mode 100644
index 0000000000..dff4e78e7f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png
new file mode 100644
index 0000000000..5fec0419e0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png
new file mode 100644
index 0000000000..8983671a0d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png
new file mode 100644
index 0000000000..3a8d3ac7a8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png
new file mode 100644
index 0000000000..5fa2763614
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png
new file mode 100644
index 0000000000..931b4d5b87
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png
index a869a8cdae..7e3892102f 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png
new file mode 100644
index 0000000000..c3809b0f60
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png
new file mode 100644
index 0000000000..37ee6de2a6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png
new file mode 100644
index 0000000000..635972c5bc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png
new file mode 100644
index 0000000000..e067a5bb7b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
new file mode 100644
index 0000000000..ad90c44566
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png
new file mode 100644
index 0000000000..7941306123
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png
new file mode 100644
index 0000000000..eb0cdfbb25
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top.png b/core/assets-raw/sprites/blocks/liquid/conduit-top.png
deleted file mode 100644
index 8a9894c8b5..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-bottom.png
deleted file mode 100644
index 304dc71403..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-bottom.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top.png
rename to core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png
new file mode 100644
index 0000000000..43017050e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png
new file mode 100644
index 0000000000..7796332524
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png
new file mode 100644
index 0000000000..4ae0db8bf1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png
new file mode 100644
index 0000000000..b90b2a51b2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png
new file mode 100644
index 0000000000..74aedc579e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png
new file mode 100644
index 0000000000..30c4e4bcc2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 6ca44197c3..51cdebf247 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -34,28 +34,28 @@ bridge-conveyor-end
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 587, 118
+  xy: 637, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 597, 128
+  xy: 627, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 587, 108
+  xy: 637, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 617, 108
+  xy: 662, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -195,21 +195,21 @@ plasma-drill-top
   index: -1
 tungsten-drill
   rotate: false
-  xy: 670, 138
+  xy: 429, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-rotator
   rotate: false
-  xy: 680, 139
+  xy: 433, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-top
   rotate: false
-  xy: 677, 128
+  xy: 433, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -321,14 +321,14 @@ coal3
   index: -1
 dirt2
   rotate: false
-  xy: 363, 5
+  xy: 517, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 373, 15
+  xy: 517, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -342,42 +342,42 @@ dirtedge
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 393, 15
+  xy: 987, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 393, 5
+  xy: 997, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 403, 25
+  xy: 987, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 403, 15
+  xy: 997, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 393, 25
+  xy: 977, 357
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 383, 5
+  xy: 977, 347
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -391,42 +391,42 @@ grassedge
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 517, 121
+  xy: 409, 48
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 517, 111
+  xy: 409, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 517, 101
+  xy: 413, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 967, 357
+  xy: 413, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 403, 5
+  xy: 1007, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 517, 131
+  xy: 1007, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -440,35 +440,35 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 967, 347
+  xy: 413, 8
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 977, 357
+  xy: 701, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 977, 357
+  xy: 701, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 977, 347
+  xy: 711, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 977, 347
+  xy: 711, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -482,56 +482,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 795, 302
+  xy: 555, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 507, 181
+  xy: 565, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 505, 171
+  xy: 522, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 567, 181
+  xy: 542, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 555, 171
+  xy: 540, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 565, 171
+  xy: 527, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 522, 161
+  xy: 537, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 532, 161
+  xy: 552, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -552,49 +552,49 @@ oiledge
   index: -1
 rock2
   rotate: false
-  xy: 627, 128
+  xy: 647, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 637, 118
+  xy: 657, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 647, 128
+  xy: 657, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 637, 108
+  xy: 657, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 647, 118
+  xy: 672, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 637, 128
+  xy: 660, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 627, 108
+  xy: 657, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -608,49 +608,49 @@ sandedge
   index: -1
 shrubshadow
   rotate: false
-  xy: 577, 98
+  xy: 682, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 607, 98
+  xy: 667, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 617, 98
+  xy: 667, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 627, 98
+  xy: 670, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 637, 98
+  xy: 680, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 587, 98
+  xy: 667, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 597, 98
+  xy: 667, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -671,42 +671,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 662, 148
+  xy: 677, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 660, 138
+  xy: 677, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 657, 128
+  xy: 889, 317
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 657, 118
+  xy: 516, 63
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 647, 98
+  xy: 677, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 662, 158
+  xy: 677, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -720,91 +720,91 @@ stoneedge
   index: -1
 thorium1
   rotate: false
-  xy: 657, 108
+  xy: 516, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 657, 98
+  xy: 506, 49
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 672, 159
+  xy: 496, 48
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 682, 159
+  xy: 516, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 672, 149
+  xy: 506, 39
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 682, 149
+  xy: 419, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten1
   rotate: false
-  xy: 667, 118
+  xy: 423, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten2
   rotate: false
-  xy: 667, 108
+  xy: 423, 8
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten3
   rotate: false
-  xy: 667, 98
+  xy: 516, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 677, 118
+  xy: 433, 8
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 677, 108
+  xy: 439, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 677, 98
+  xy: 443, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 889, 317
+  xy: 443, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -867,14 +867,14 @@ border
   index: -1
 conduit-liquid
   rotate: false
-  xy: 353, 5
+  xy: 383, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 373, 25
+  xy: 517, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -902,7 +902,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 383, 15
+  xy: 967, 347
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -916,14 +916,14 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 597, 118
+  xy: 647, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 607, 128
+  xy: 637, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1068,37 +1068,128 @@ conduit-bottom
   orig: 8, 8
   offset: 0, 0
   index: -1
-conduit-top
+conduit-bottom-0
+  rotate: false
+  xy: 353, 5
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-bottom-1
   rotate: false
   xy: 363, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+conduit-bottom-2
+  rotate: false
+  xy: 373, 25
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-bottom-3
+  rotate: false
+  xy: 363, 5
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-bottom-4
+  rotate: false
+  xy: 373, 15
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-bottom-5
+  rotate: false
+  xy: 383, 25
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-bottom-6
+  rotate: false
+  xy: 373, 5
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-top-0
+  rotate: false
+  xy: 393, 25
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-top-1
+  rotate: false
+  xy: 383, 5
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-top-2
+  rotate: false
+  xy: 393, 15
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-top-3
+  rotate: false
+  xy: 393, 5
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-top-4
+  rotate: false
+  xy: 403, 25
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-top-5
+  rotate: false
+  xy: 403, 15
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conduit-top-6
+  rotate: false
+  xy: 403, 5
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 liquid-router
   rotate: false
-  xy: 547, 181
+  xy: 520, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 535, 171
+  xy: 532, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 557, 181
+  xy: 530, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 545, 171
+  xy: 527, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1126,35 +1217,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 577, 118
+  xy: 627, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 587, 128
+  xy: 617, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 577, 108
+  xy: 627, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-pulse-conduit-bottom
+pulse-conduit-top-0
   rotate: false
-  xy: 597, 108
+  xy: 647, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-pulse-conduit-top
+pulse-conduit-top-1
   rotate: false
-  xy: 607, 118
+  xy: 647, 108
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-2
+  rotate: false
+  xy: 567, 98
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-3
+  rotate: false
+  xy: 577, 98
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-4
+  rotate: false
+  xy: 587, 98
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-5
+  rotate: false
+  xy: 597, 98
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-6
+  rotate: false
+  xy: 607, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1259,7 +1385,7 @@ nuclear-reactor-lights
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 627, 118
+  xy: 662, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1434,14 +1560,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 785, 302
+  xy: 567, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 542, 161
+  xy: 550, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1483,21 +1609,21 @@ poweralloysmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 617, 128
+  xy: 617, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 607, 108
+  xy: 627, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 647, 108
+  xy: 682, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1595,7 +1721,7 @@ mass-driver-turret
   index: -1
 duo
   rotate: false
-  xy: 373, 5
+  xy: 967, 357
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1798,7 +1924,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 617, 118
+  xy: 637, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1819,7 +1945,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 383, 25
+  xy: 517, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1987,7 +2113,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 567, 98
+  xy: 672, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2001,7 +2127,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 667, 128
+  xy: 423, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3352,28 +3478,28 @@ block-icon-wave
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 527, 181
+  xy: 542, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 515, 171
+  xy: 552, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 537, 181
+  xy: 562, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 525, 171
+  xy: 522, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3429,525 +3555,525 @@ mech-icon-tau-mech
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 552, 161
+  xy: 527, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 562, 161
+  xy: 537, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 522, 151
+  xy: 547, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 520, 141
+  xy: 562, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 532, 151
+  xy: 560, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 530, 141
+  xy: 527, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 527, 131
+  xy: 537, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 542, 151
+  xy: 547, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 540, 141
+  xy: 557, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 527, 121
+  xy: 537, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 537, 131
+  xy: 547, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 552, 151
+  xy: 557, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 550, 141
+  xy: 547, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 527, 111
+  xy: 557, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 537, 121
+  xy: 557, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 547, 131
+  xy: 577, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 562, 151
+  xy: 587, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 560, 141
+  xy: 597, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 527, 101
+  xy: 607, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 537, 111
+  xy: 617, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 547, 121
+  xy: 627, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 557, 131
+  xy: 637, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 537, 101
+  xy: 575, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 547, 111
+  xy: 585, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 557, 121
+  xy: 595, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 547, 101
+  xy: 605, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 557, 111
+  xy: 615, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 557, 101
+  xy: 625, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 577, 178
+  xy: 635, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 587, 178
+  xy: 572, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 597, 178
+  xy: 582, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 607, 178
+  xy: 592, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 617, 178
+  xy: 602, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 627, 178
+  xy: 612, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 637, 178
+  xy: 622, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 575, 168
+  xy: 632, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 585, 168
+  xy: 572, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 595, 168
+  xy: 582, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 605, 168
+  xy: 592, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 615, 168
+  xy: 602, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 625, 168
+  xy: 612, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 635, 168
+  xy: 622, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 572, 158
+  xy: 632, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 582, 158
+  xy: 645, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 592, 158
+  xy: 655, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 602, 158
+  xy: 642, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 612, 158
+  xy: 642, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 622, 158
+  xy: 652, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 632, 158
+  xy: 652, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 572, 148
+  xy: 570, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 582, 148
+  xy: 580, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 592, 148
+  xy: 590, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 602, 148
+  xy: 600, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 612, 148
+  xy: 610, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 622, 148
+  xy: 620, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 632, 148
+  xy: 630, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 645, 168
+  xy: 640, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 655, 168
+  xy: 650, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 642, 158
+  xy: 567, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 642, 148
+  xy: 567, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass1
   rotate: false
-  xy: 652, 158
+  xy: 577, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass2
   rotate: false
-  xy: 652, 148
+  xy: 567, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass3
   rotate: false
-  xy: 570, 138
+  xy: 577, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice1
   rotate: false
-  xy: 580, 138
+  xy: 587, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice2
   rotate: false
-  xy: 590, 138
+  xy: 577, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice3
   rotate: false
-  xy: 600, 138
+  xy: 587, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand1
   rotate: false
-  xy: 610, 138
+  xy: 597, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand2
   rotate: false
-  xy: 620, 138
+  xy: 587, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand3
   rotate: false
-  xy: 630, 138
+  xy: 597, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow1
   rotate: false
-  xy: 640, 138
+  xy: 607, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow2
   rotate: false
-  xy: 650, 138
+  xy: 597, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow3
   rotate: false
-  xy: 567, 128
+  xy: 607, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone1
   rotate: false
-  xy: 567, 118
+  xy: 617, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone2
   rotate: false
-  xy: 577, 128
+  xy: 607, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone3
   rotate: false
-  xy: 567, 108
+  xy: 617, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3982,112 +4108,112 @@ vtol
   index: -1
 item-biomatter
   rotate: false
-  xy: 997, 355
+  xy: 731, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 987, 345
+  xy: 775, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-carbide
   rotate: false
-  xy: 997, 345
+  xy: 785, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1007, 349
+  xy: 795, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1007, 339
+  xy: 507, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 409, 48
+  xy: 505, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 409, 38
+  xy: 517, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 413, 28
+  xy: 527, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 413, 18
+  xy: 515, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 413, 8
+  xy: 537, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 701, 161
+  xy: 525, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 711, 161
+  xy: 547, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 721, 161
+  xy: 535, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 731, 161
+  xy: 557, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tungsten
   rotate: false
-  xy: 775, 302
+  xy: 545, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 517, 181
+  xy: 532, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4740,7 +4866,7 @@ icon-itch.io
   index: -1
 icon-items-none
   rotate: false
-  xy: 987, 355
+  xy: 721, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index da1679d01e..9ae2122cd9 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java
index 61e3e44989..4c784bebd5 100644
--- a/core/src/io/anuke/mindustry/entities/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/TileEntity.java
@@ -151,7 +151,10 @@ public class TileEntity extends BaseEntity implements TargetTrait {
 		for (GridPoint2 point : nearby) {
 			Tile other = world.tile(tile.x + point.x, tile.y + point.y);
 			//remove this tile from all nearby tile's proximities
-			if(other != null) other = other.target();
+			if(other != null){
+			    other = other.target();
+                other.block().onProximityUpdate(other);
+            }
 			if(other != null && other.entity != null){
 				other.entity.proximity.removeValue(tile, true);
 			}
@@ -165,7 +168,12 @@ public class TileEntity extends BaseEntity implements TargetTrait {
 		GridPoint2[] nearby = Edges.getEdges(tile.block().size);
 		for (GridPoint2 point : nearby) {
 			Tile other = world.tile(tile.x + point.x, tile.y + point.y);
-			if(other != null) other = other.target();
+
+			if(other != null){
+                other.block().onProximityUpdate(other);
+			    other = other.target();
+            }
+
 			if(other != null && other.entity != null){
 				tmpTiles.add(other);
 
@@ -180,6 +188,8 @@ public class TileEntity extends BaseEntity implements TargetTrait {
 		for(Tile tile : tmpTiles){
 			proximity.add(tile);
 		}
+
+		tile.block().onProximityUpdate(tile);
 	}
 
 	public Array<Tile> proximity(){
diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java
index 00863d5f2c..68dbda64a5 100644
--- a/core/src/io/anuke/mindustry/world/BaseBlock.java
+++ b/core/src/io/anuke/mindustry/world/BaseBlock.java
@@ -64,6 +64,8 @@ public abstract class BaseBlock {
 
     }
 
+    public void onProximityUpdate(Tile tile){}
+
     public void handleItem(Item item, Tile tile, Tile source){
         tile.entity.items.add(item, 1);
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
index f4beeb228a..e5bcdbf84f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
@@ -16,6 +16,9 @@ import java.io.IOException;
 public class Conduit extends LiquidBlock {
     protected final int timerFlow = timers++;
 
+    protected TextureRegion[] topRegions = new TextureRegion[7];
+    protected TextureRegion[] botRegions = new TextureRegion[7];
+
     public Conduit(String name) {
         super(name);
         rotate = true;
@@ -27,24 +30,59 @@ public class Conduit extends LiquidBlock {
         super.load();
 
         liquidRegion = Draw.region("conduit-liquid");
+        for (int i = 0; i < topRegions.length; i++) {
+            topRegions[i] = Draw.region(name + "-top-" + i);
+            botRegions[i] = Draw.region("conduit-bottom-" + i);
+        }
+    }
 
+    public void onProximityUpdate(Tile tile){
+        ConduitEntity entity = tile.entity();
+        entity.blendbits = 0;
+
+        if(blends(tile, 0)){
+            if(blends(tile, 2) && blends(tile, 1) && blends(tile, 3)) {
+                entity.blendbits = 3;
+            }else if(blends(tile, 1) && blends(tile, 3)) {
+                    entity.blendbits = 6;
+            }else if(blends(tile, 1) && blends(tile, 2)) {
+                entity.blendbits = 2;
+            }else if(blends(tile, 3) && blends(tile, 2)) {
+                entity.blendbits = 4;
+            }else if(blends(tile, 1)) {
+                entity.blendbits = 5;
+            }else if(blends(tile, 3)) {
+                entity.blendbits = 1;
+            }
+        }else if(blends(tile, 1)) {
+            entity.blendbits = 5;
+        }else if(blends(tile, 3)) {
+            entity.blendbits = 1;
+        }
+    }
+
+    private boolean blends(Tile tile, int direction){
+        Tile other = tile.getNearby(Mathf.mod(tile.getRotation() - direction, 4));
+        if(other == null || !(other.block().hasLiquids)) return false;
+        return (tile.getNearby(tile.getRotation()) == other)
+                || (!other.block().rotate || other.getNearby(other.getRotation()) == tile);
     }
 
     @Override
     public void draw(Tile tile){
         ConduitEntity entity = tile.entity();
         LiquidModule mod = tile.entity.liquids;
+        int rotation = tile.getRotation() * 90;
 
-        int rotation = rotate ? tile.getRotation() * 90 : 0;
-
-        Draw.rect(bottomRegion, tile.drawx(), tile.drawy(), rotation);
+        Draw.colorl(0.34f);
+        Draw.rect(botRegions[entity.blendbits], tile.drawx(), tile.drawy(), rotation);
 
         Draw.color(mod.current().color);
         Draw.alpha(entity.smoothLiquid);
-        Draw.rect(liquidRegion, tile.drawx(), tile.drawy(), rotation);
+        Draw.rect(botRegions[entity.blendbits], tile.drawx(), tile.drawy(), rotation);
         Draw.color();
 
-        Draw.rect(topRegion, tile.drawx(), tile.drawy(), rotation);
+        Draw.rect(topRegions[entity.blendbits], tile.drawx(), tile.drawy(), rotation);
     }
 
     @Override
@@ -62,7 +100,10 @@ public class Conduit extends LiquidBlock {
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name() + "-bottom"), Draw.region(name() + "-top")};
+        if(icon == null){
+            icon = new TextureRegion[]{Draw.region("conduit-bottom"), Draw.region(name + "-top-0")};
+        }
+        return icon;
     }
 
     @Override
@@ -78,6 +119,7 @@ public class Conduit extends LiquidBlock {
 
     public static class ConduitEntity extends TileEntity {
         public float smoothLiquid;
+        public byte blendbits;
 
         @Override
         public void write(DataOutputStream stream) throws IOException {