From 07d9feeb09a149f8494ca3bcf028b624a6c8fab7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 7 Nov 2021 12:56:58 -0500
Subject: [PATCH] WIP reinforced conduits

---
 .../{ => conduits}/conduit-bottom-0.png       | Bin
 .../{ => conduits}/conduit-bottom-1.png       | Bin
 .../{ => conduits}/conduit-bottom-2.png       | Bin
 .../{ => conduits}/conduit-bottom-3.png       | Bin
 .../{ => conduits}/conduit-bottom-4.png       | Bin
 .../liquid/{ => conduits}/conduit-bottom.png  | Bin
 .../liquid/{ => conduits}/conduit-top-0.png   | Bin
 .../liquid/{ => conduits}/conduit-top-1.png   | Bin
 .../liquid/{ => conduits}/conduit-top-2.png   | Bin
 .../liquid/{ => conduits}/conduit-top-3.png   | Bin
 .../liquid/{ => conduits}/conduit-top-4.png   | Bin
 .../{ => conduits}/phase-conduit-end.png      | Bin
 .../{ => conduits}/plated-conduit-cap.png     | Bin
 .../{ => conduits}/plated-conduit-top-0.png   | Bin
 .../{ => conduits}/plated-conduit-top-1.png   | Bin
 .../{ => conduits}/plated-conduit-top-2.png   | Bin
 .../{ => conduits}/plated-conduit-top-3.png   | Bin
 .../{ => conduits}/plated-conduit-top-4.png   | Bin
 .../{ => conduits}/pulse-conduit-top-0.png    | Bin
 .../{ => conduits}/pulse-conduit-top-1.png    | Bin
 .../{ => conduits}/pulse-conduit-top-2.png    | Bin
 .../{ => conduits}/pulse-conduit-top-3.png    | Bin
 .../{ => conduits}/pulse-conduit-top-4.png    | Bin
 .../conduits/reinforced-conduit-cap.png       | Bin 0 -> 179 bytes
 .../conduits/reinforced-conduit-top-0.png     | Bin 0 -> 368 bytes
 .../conduits/reinforced-conduit-top-1.png     | Bin 0 -> 387 bytes
 .../conduits/reinforced-conduit-top-2.png     | Bin 0 -> 351 bytes
 .../conduits/reinforced-conduit-top-3.png     | Bin 0 -> 279 bytes
 .../conduits/reinforced-conduit-top-4.png     | Bin 0 -> 339 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 3085 -> 3105 bytes
 core/src/mindustry/content/Blocks.java        |  12 ++++++++++++
 core/src/mindustry/graphics/Pal.java          |   1 +
 .../world/blocks/liquid/Conduit.java          |   6 ++++--
 34 files changed, 18 insertions(+), 2 deletions(-)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-bottom-0.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-bottom-1.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-bottom-2.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-bottom-3.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-bottom-4.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-bottom.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-top-0.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-top-1.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-top-2.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-top-3.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/conduit-top-4.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/phase-conduit-end.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/plated-conduit-cap.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/plated-conduit-top-0.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/plated-conduit-top-1.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/plated-conduit-top-2.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/plated-conduit-top-3.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/plated-conduit-top-4.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/pulse-conduit-top-0.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/pulse-conduit-top-1.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/pulse-conduit-top-2.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/pulse-conduit-top-3.png (100%)
 rename core/assets-raw/sprites/blocks/liquid/{ => conduits}/pulse-conduit-top-4.png (100%)
 create mode 100644 core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png
 create mode 100644 core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png
 create mode 100644 core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png
 create mode 100644 core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png
 create mode 100644 core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png
 create mode 100644 core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png

diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-1.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-2.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-4.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-4.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-1.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-1.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-2.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-2.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-4.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-4.png
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/conduits/phase-conduit-end.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/phase-conduit-end.png
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-cap.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-cap.png
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-1.png
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-2.png
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-4.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-4.png
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/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/conduits/pulse-conduit-top-1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-1.png
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-2.png
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-4.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-4.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png
new file mode 100644
index 0000000000000000000000000000000000000000..c416e449d7c5bc52f7593056fd6437c69a9b9924
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0y~yU@&4}U{K&-V_;wiP}EjrU|?V@4sv&5Sa(k5B?ALP
zuBVG*NJQ(~>l+0d6hv4qUJiS6UWh}d@!twoX#o$J=jU#U8?n?Mo_ywNSXJ)Q_5a?+
z%Y1GN_3`O2>F?y4c+9X+QMqM@;t}7N6O}QyFIR`0&~W17n(4~G@S!@VEIsF&3PhG;
f_T8gdo9{0WQNDX&O|Uit0|SGntDnm{r-UW|nPEWT

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a340e4c59ab9ac8b68c72ed73e70c55809bc3b44
GIT binary patch
literal 368
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VAS$-
zaSVxQeLH<GFOwmU+kOSMhG}AM3zwyF=CN>zIW(!RSSk55BQueyk4aJWTz~TM>kpra
z#7_FI=T)@L`tEn;Jv(CL>x4Jo7S{b3b-wvq*=CMg!d4As3xp#MO=b!cGX1c|VYQ2{
z41>&F=9n+f*BCP-Y_0ZQc6xmSn?mbqmLdh-7+r_PC<_K3Z~fg*5B_|cC~@d-(I2}x
z#g6t;OKYdaGIHs=s;JG-)>LTR?&ZRyYO(!_6z9k3*BUGW?L(G3FiE%`2y)U*5Upq2
z%1|!kCc2@CxwEEWH*55JhEv^P3%)$w(5B96!RcKQ=Ad=)leO6MmbyQm4o_=wspa|m
zWQuplS=JzjwJjAPoJ%HZJZqU{wefvQt7q8Gr5;ObU&gFyaBYpz7UYbW_S{rRJ}_zK
WNzE%uIT;uj7(8A5T-G@yGywpr5skqB

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebdfd62c44a71494b68d7ffaeca9b42cc3f87c06
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V6^pg
zaSVxQy*h29;2{GZ*Hn3C2XF4+fZ$+b2Hl<sO{_b-r!82PHf71uR!)x4qGKCVJj)I(
z)a(57HOYIE&rK0sjyGGZq+jh0Iqx;+_=f*X9l7?`-B}d`r~SC~`t8KffL+I!7y<-l
zJ(#rhuV9NpP*bs~+Day_L+9T6PmJiEA$Ev~!9&r&fY+s-Wq;F*o&2S#iM2KA&JxKd
zjub1hc}9en#2q_g-7$lo%fOUHN|W71h~apV!vcmoDL$<nOdi^btVs+Dbe(mNgv)<u
zp6+|mOHW0w#oGLv^@m$}i_Te|xxP8CAV=>6tKg-L|K|6zHm>ClbIjw&n#;&=BZkkh
z{coNpSNUC|r%bOmhjBgJo>lsD7k>=Ln|T);cwU*Y3GQBUB-Z4MQ1b&n--Yv<WL0nN
qtl@Zh;#jLfbUOROx#E@r@<$G?m-%$jwU&W_fx*+&&t;ucLK6V?yOtjS

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..bab3db3a41f1e3d98fdcb8427954e5490a486a30
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3hQ9
zaSVxQeLHO<FOwmUYrP*2gRX9mlkZs}1145(g@Zy@uJkbJ>iQfAyr8nLILX>hMWwE|
zOYdW~OJ{$<j@)P$%en7A3Oqi|Y+9+OcCupY9JR-7dJBXz82u~OH%xC~ImdOy%i|$~
zzza!@r&TF)85ur*^$za4&&ch-ZO&Psz<o!@p)t&Yp{GdSd~<Ba@!Z?Xo~Qn=Y!R4L
zX|l8U*gJ;S=a&S7ue=hya3EXNipjDfbG5F}t9UKOsV<La<TbJxbTlk)i9DcP&$!v)
zr5cac16KAE{~0~mzr0{H-25=EhWVc01dobC)vP)~VHVm4bUA$1d|2a<xzJ>()Y0q+
zWyMJCSIlCZFQp2VFL`7<TV=Iy$%eA+b>EYpOf|o*(QmXP$0?M7fq}u()z4*}Q$iB}
DaJ+=i

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..539aa3f0576e89cfec201c5d6aa125a5810477ff
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7Tb%
z;usRq`gZz7-opw!F1cYZ>tq+o%P#y~I_=B#AcK9@3xby1(YL$L%sKhT^WRoI7e0Ud
zcG2qgdc&jECAtl-eq5B|Y{)!w#fjm~IthQy1ue$+6c6}V+)`$JA=&R@ED+03_S{%N
zo#E?^(2g)smz}>0VjFL4y3J+cC3V#2fLOy+f$LR0c?}v*PUSL3h~}j|`zXyfvq?M6
z;Y`lWL-vRK890ud`k>dqw6JYC!_0%iD<3*Hoa$KhDlqP_B*zi%vy7}vUk@~QG$v%N
i^z1O%SML}3m!W-PpP0r`-z5wT3=E#GelF{r5}E+0Y;vst

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..391ac88373990f030284b1a8d6b371eb2968ea95
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VC405
zaSVxQeLH=x;2{GZH~ZH{3|qDsaG9EVAK(z_ahSGXS=y8fmkzPa&=YT7EN@--&f<#O
zwd&4P)xzbs4;~iy{q$nt^|fD5OtNwNGp}KbYdq8Q)3qNSiE%P9^tOCGx8>(su>zs6
z9jUPwm<>Bac9hwkUB_Q)cwg93h=oC{({5u(XBqdhNgP!UlM2pl{5?}CuvX2)G;wS7
zMj@FK)$dg=u5&37GBdSTP;F4H@?5GC(WPRz%b_!Ybw`>^tV2_FU(6;4O$&jU%sUIt
zzI;(<&gTDM=REONb|#^iE|Cgt15p_UEpD6AUxoj<9Qkw1xi3G8sZbDTe(sfVZ6b^R
s)C<ohv*qb#O_cqU`sKgn)??D^7cE%3Uhdus1_lNOPgg&ebxsLQ0RMu8;{X5v

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 2f97c447d2..de58dcebb1 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -426,3 +426,4 @@
 63282=surge-conveyor|block-surge-conveyor-ui
 63281=duct-unloader|block-duct-unloader-ui
 63280=surge-router|block-surge-router-ui
+63279=reinforced-conduit|block-reinforced-conduit-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index e81d33169c27a84dfa1400efcc24548383d966e8..3d666ae3d03be55744aaa0805912fac99f9afdf4 100644
GIT binary patch
delta 36
rcmeB`SSZ27uzn-cbxvWSqSVa1wEUvv)D+$1{JfOX%#zJFI8B)V<gg6a

delta 16
XcmZ1|(JR5kux=yMb<WLiIZc=VFLDKe

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 61e4b02533..8f7115b086 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -80,6 +80,8 @@ public class Blocks implements ContentList{
     //liquid
     mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
 
+    reinforcedConduit,
+
     //power
     combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
     turbineCondenser,
@@ -1426,6 +1428,16 @@ public class Blocks implements ContentList{
             consumes.power(0.30f);
         }};
 
+        reinforcedConduit = new ArmoredConduit("reinforced-conduit"){{
+            requirements(Category.liquid, with(Items.beryllium, 2, Items.graphite, 1));
+            botColor = Pal.darkestMetal;
+            leaks = true;
+            liquidCapacity = 20f;
+            liquidPressure = 1.1f;
+            health = 250;
+        }};
+
+
         //endregion
         //region power
 
diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java
index a1f8d946be..fc55c3510f 100644
--- a/core/src/mindustry/graphics/Pal.java
+++ b/core/src/mindustry/graphics/Pal.java
@@ -28,6 +28,7 @@ public class Pal{
 
     darkMetal = Color.valueOf("6e7080"),
     darkerMetal = Color.valueOf("565666"),
+    darkestMetal = Color.valueOf("38393f"),
 
     missileYellow = Color.valueOf("ffd2ae"),
     missileYellowBack = Color.valueOf("e58956"),
diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java
index 8e6249e828..32d539f22c 100644
--- a/core/src/mindustry/world/blocks/liquid/Conduit.java
+++ b/core/src/mindustry/world/blocks/liquid/Conduit.java
@@ -98,7 +98,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
     public class ConduitBuild extends LiquidBuild implements ChainedBuilding{
         public float smoothLiquid;
         public int blendbits, xscl = 1, yscl = 1, blending;
-        public boolean capped;
+        public boolean capped, backCapped = false;
 
         @Override
         public void draw(){
@@ -122,6 +122,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
             Draw.reset();
 
             if(capped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg());
+            if(backCapped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg() + 180);
         }
 
         protected void drawAt(float x, float y, int bits, float rotation, SliceMode slice){
@@ -143,8 +144,9 @@ public class Conduit extends LiquidBlock implements Autotiler{
             yscl = bits[2];
             blending = bits[4];
 
-            Building next = front();
+            Building next = front(), prev = back();
             capped = next == null || next.team != team || !next.block.hasLiquids;
+            backCapped = blendbits == 0 && (prev == null || prev.team != team || !prev.block.hasLiquids);
         }
 
         @Override