From 3ba55d07988315f7182cbdd4e9f5380b75aa7dfe Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 18 Feb 2022 10:31:11 +1300
Subject: [PATCH] Fix rotated pipe connection visuals (#6756)

---
 .../AtmosPipeAppearanceSystem.cs              |  22 ++++++++++++++----
 .../Components/PipeAppearanceComponent.cs     |   2 +-
 .../Piping/Atmospherics/pipe.rsi/meta.json    |  17 ++++----------
 .../Atmospherics/pipe.rsi/pipeConnector.png   | Bin 0 -> 1526 bytes
 .../pipe.rsi/pipeConnectorEast.png            | Bin 1029 -> 0 bytes
 .../pipe.rsi/pipeConnectorNorth.png           | Bin 1113 -> 0 bytes
 .../pipe.rsi/pipeConnectorSouth.png           | Bin 1140 -> 0 bytes
 .../pipe.rsi/pipeConnectorWest.png            | Bin 1047 -> 0 bytes
 .../Atmospherics/pipe.rsi/pipeFourway.png     | Bin 2244 -> 4871 bytes
 9 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnector.png
 delete mode 100644 Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorEast.png
 delete mode 100644 Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorNorth.png
 delete mode 100644 Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorSouth.png
 delete mode 100644 Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorWest.png

diff --git a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
index 38076ef5a6..44323d2af7 100644
--- a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
@@ -37,8 +37,9 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
             sprite.LayerMapReserveBlank(layerKey);
             var layer = sprite.LayerMapGet(layerKey);
             sprite.LayerSetRSI(layer, rsi.RSI);
-            var layerState = component.BaseState + (PipeDirection) layerKey;
+            var layerState = component.State;
             sprite.LayerSetState(layer, layerState);
+            sprite.LayerSetDirOffset(layer, ToOffset(layerKey));
         }
     }
 
@@ -50,11 +51,12 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
         if (!args.Component.TryGetData(PipeColorVisuals.Color, out Color color))
             color = Color.White;
 
-        if (!args.Component.TryGetData(PipeVisuals.VisualState, out PipeDirection connectedDirections))
+        if (!args.Component.TryGetData(PipeVisuals.VisualState, out PipeDirection worldConnectedDirections))
             return;
 
-        var rotation = Transform(uid).LocalRotation;
-
+        // transform connected directions to local-coordinates
+        var connectedDirections = worldConnectedDirections.RotatePipeDirection(-Transform(uid).LocalRotation);
+        
         foreach (PipeConnectionLayer layerKey in Enum.GetValues(typeof(PipeConnectionLayer)))
         {
             if (!sprite.LayerMapTryGet(layerKey, out var key))
@@ -68,11 +70,21 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
 
             if (!visible) continue;
 
-            layer.Rotation = -rotation;
             layer.Color = color;
         }
     }
 
+    private SpriteComponent.DirectionOffset ToOffset(PipeConnectionLayer layer)
+    {
+        return layer switch
+        {
+            PipeConnectionLayer.NorthConnection => SpriteComponent.DirectionOffset.Flip,
+            PipeConnectionLayer.EastConnection => SpriteComponent.DirectionOffset.CounterClockwise,
+            PipeConnectionLayer.WestConnection => SpriteComponent.DirectionOffset.Clockwise,
+            _ => SpriteComponent.DirectionOffset.None,
+        };
+    }
+
     private enum PipeConnectionLayer : byte
     {
         NorthConnection = PipeDirection.North,
diff --git a/Content.Shared/Atmos/Components/PipeAppearanceComponent.cs b/Content.Shared/Atmos/Components/PipeAppearanceComponent.cs
index b7e4ac477c..f36ede3dfb 100644
--- a/Content.Shared/Atmos/Components/PipeAppearanceComponent.cs
+++ b/Content.Shared/Atmos/Components/PipeAppearanceComponent.cs
@@ -7,5 +7,5 @@ public sealed class PipeAppearanceComponent : Component
     public string RsiPath = "Structures/Piping/Atmospherics/pipe.rsi";
 
     [DataField("baseState")]
-    public string BaseState = "pipeConnector";
+    public string State = "pipeConnector";
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
index 727ffdb390..b4968add2a 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
@@ -20,23 +20,16 @@
          "directions":4
       },
       {
-         "name":"pipeFourway",
+         "name": "pipeFourway",
+         "directions":4
       },
       {
          "name":"pipeStraight",
          "directions":4
       },
       {
-         "name":"pipeConnectorSouth",
-      },
-      {
-         "name":"pipeConnectorNorth",
-      },
-      {
-         "name":"pipeConnectorEast",
-      },
-      {
-         "name":"pipeConnectorWest",
+         "name":"pipeConnector",
+         "directions":4
       }
    ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnector.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnector.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f5ad1cbd9bde8102bfa2f4fe40ac03741764737
GIT binary patch
literal 1526
zcmV<S1qu3zP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_000E{dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|edgLe!eCHH<1WQ5)j>Dh6Z*Q>2-vT?GbWf5=
zX8JKEZETPQs0tMc^S^&R{DX^Qi6N@xR8l%{;k|IhLq5*ytm%mRzOQ(7;r*^X+&UOd
zf?CekG%x##c76T8t`Df)w+HK&pL{vGI$j*g8kzBM+2zZT@Yzn+dnng;HNIKS_4CfV
zTie<7_#O?x7z%&Ffv1ohxTiIWtRG9=bw!Wy*}9(3JHH>haC>|R-tFljc1OM1<vtYQ
zNS8r+h|$$f`hM(ogx=1GUPr#`sQE^MUt{MZyU%lVH6}zVg=<kSOW98_L^z}D&k~B^
zr+Btq3QEQjI}jT{v!V1rg&1*kiZrN_)7*8Zjwwc-jBqn^XW4BT;V;|~c#^mZIhzz2
zK{8P3Kuyrhx4F<Bx9sscWsE!smP~L)8`*~v-fR4ma&zRqs7rL@TdXiIUaY}17INzj
zD*!@%#Z-5EcL{HJbG!jofS~R$XDqND?R3$UUb!V3XMvp_F<jf3Y+McyB8;t=3<(f8
z5{Xix!<dZ-am>J{V&*K78xSB>9uyqdh$MiMd5w*4jJ7Q+pUp@u074~+0h%HeV8y85
zkHriQRTYgvRg;=#En1VLm^7tiY2~PDV$sx+nPn?hv*egHr))Xrl5622NMTx1u~2d;
zrB)1D;kx4M3X57BH)*kHOU+ttrPU7l^w_nhZaw$X>);^++kd2CVdPOpoistE8K=%P
zZRS~Kb#TqaqpK%3&tAOVP`gmQM~xnk`y4g8P+N$_ZD+5jq1o)k1+8?V3o{_bk$|`@
z1VCtBm>rp7<b~YA>?n*)p$ybW7dV3!Vn8rXVs*M<_ln%7xCM>h!i_&dE-dJtfm~S7
zUC8~4+dHU@x)nt>Kx-GSm>%LtY)C<sGyaek|GW<Gb<i=e6wf3+)g60%j)L6Uhfb=!
z;TmRI$$ErIkKST1@S}R4E-kH3dh2QQB+H<<Vj<bOtsa+SuDT^SZ9I$+JrJ4T)LXEI
zfqdpMqZMflu>eStJ<%+h9W+ylO24baR}Ft0?S>pDP8%&rQ>$zcuOSV{ilf1Sip~xd
z^9&&a%phs19(f^|0lzs&j4Z*l8KW~FGOhN(+|rywJqkF&@VQwIn{sSARM%<E!L~R(
zV30+)UVTh2r7cQL0+Fc6KpWh4Pm8B@oyI<_!|x2fTAz-Z*EDPKQQAyCr}ge4<X!V3
z`NU*#X7!AN)|x+0P`%LRdmTtXQP=s%R|Mi-b)36%+rR?bJ<r;(<87)f|7|CPt_Zdf
z{0}6zb4sB;X>C7_Uh0U0gpNM5I`Wevh0OsVae52jd@o}$dwOf&zOPL&xMfX}yIL#u
zk}84gPL+$mBOWvrc@2j-csxQ|)Sd;q!r`ysgECi!B%nP~quLsI&X@^UHkK2pg?rLE
zrM}71;R$*FOO76N;BIkuN)Ya(;9dzn(g9xw5u}l=0@z<$2f`a6_$wU<Pe_hGj{eNi
zcZCH1bzf2vJja`mtOL&`-KSE5t-HizNy$pJmz0F9C40a9osfhl2*|yoZwU$Ci^P%<
z9Q|%GvQ~dDG~bYs@T8UfIC`R^4|E9sP)XcE6vnwVZdwFJeWXTj4(<<Hgwz^#_t({E
zYZ18js75v1i-us_QNsVR&B}g*b(?tr001gbOjJbx9t0T~86hDd8X6iM9UU7R8-|94
zw6wIpzrVM)x45{twY9ZgUS1y`9}c4vkpKVy0d!JMQvg8b*k%9#00Cl4M??UK1szBL
z000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j&712MP{`wBoG*002TsL_t(Y$75i?
z3Rq60FyI9Q6)>JiWEcgbU=+|CjAqtRfHm43T?FtdU`tC&z^j0xqoV<@0-iHx4p8QX
cQ81(d06%*Tbst-`H2?qr07*qoM6N<$f_ss$IsgCw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorEast.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorEast.png
deleted file mode 100644
index c26ad0b9cac12e98efe2f1f24feb419ffecefb73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1029
zcmV+g1p51lP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP50009idQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHmLn$&hTmC5mVj<tmc#X&>>$g}4@KK;kJCMw
z%v)S^l_()3&<D8Mjlce!?hjm)Rh?Q)A&1~`Y1YgImE^DMlH_$i_r<3P?+<!+Yhb7Z
zQm)r9j(vgN?j52YeSOrs*p8oc9G!*_hq5BCXvZ!cN5Yq$&b!N}U(rv~IrnV5o2_0=
z&+i(MjBfBJ?05)?$5U4nSvN_6Tu&B;(N$MTThFg^=Wf-f<lSmdx%1`d<uMh`hhq?)
za&+`$uXDFE^m#;dkNnV(=oaF~+|8cm9M|lM24pI@GpUcM>>3P_PL<s)phVn;dfX+W
zBuue^SO?9D(i~-CWP6fQr$Up)mW>*Qs604AGB+?-x+IY^w+%p7p~+FQbO#nJ4b%i`
zzKw-;+`Qv8N{HMEmP~L)i{^82uav)1ZjR<$OP9!}TdpuJUaJPfSmf3dRscft<kWV4
zcX6NAjsFBzK+txY6DC-Ey<AkI``VJtSzu>goxipQ#eN(hMTl(}3<(JMKw=cgN9IU`
zJSOld7&(h_1pzYSPHuvYNC2F~D>nK>+O}+bsd2Obgh`MHG+7E@sT$T#)PyxuOiZ1b
z1&fv}TL}_0SO_78bw-saQKQ8WV@xr}k|b%e6jDqn<y10f!4YOT<mhtBIhTT<1+EKv
z7g&^1xk}Y)HPl#B&9yWvpQg=PXtAZ1Tj|`TWBd2eqwA^XUIq;;rJ=({7;&VLN10e_
zQ>IRvVaAzep5;dEP<^CEPvpL)Mu*xWrrR#wsX-m%hYMQAi7jRz#!4U_7Xd72Ud*tc
zRe6zH%zS2S3S&?sTW~rpVj!r4*e2cB-N}8)&6)lyZv0Q=+(P#|$hn2?ko%F_3u?XW
zUliGZ)-GH*^)hj=;Rq_6@Q3sG*QNWf4&IL5j{dKXa8h^<g>zMWDoR-`Wql&PmX5zM
z_*r>(RC^w^1+JsujP`>thB3lwn;GZIH~!pj8qnQQt+Nczh1Lkv3fDHvYKcZ_>m&GU
z>Ao}gS^0MKcJy}iTH+(V<Nr$cH`tnR-Lmym8vp<RDo{*RMF7Xi85tQNAt4$X8XX-S
z8yg#jhK97Xw7<W<x3{;rxVW{owO(FcA0Hnvre5y=0004WQchC<K<3zH00001VoOIv
z0Eh)0NB{r;32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rg0Tu@^1A$L)t^fc4A4x<(
zR4C75U>G@o(FIL_Ee%b8qXSKV=L{h;hB*KLfouX_gQMG%00000NkvXXu0mjfo{!BP

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorNorth.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorNorth.png
deleted file mode 100644
index 30c6e83d71e8e4c619ca6f5b1c8ba8ab41f54a1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP5000AjdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KJb|Wbah2L4lECERf!E*RLXLiubp9>~-?8NDG
z&YXU7kt$KL5O6<=s<`p%-|7CrK{-Vi)KbhbdK@8#%mtO?FUQ4_5Bs_gK0o39&hM^2
zFkAvFm)kf_e1TtY4J;ggz4tq7Cr>(w$lrA>tLIfeap@!yzWC|fyL{S}@NPQi<aW}&
zP3z%47{us`e8P^0ka%3f>P6N`QefAWB=f38)Ma~uJkicws}JH`YY*D_a{O{Hh4b+Q
z#0QOzpY*{m*KYW3M0D%<?uSyZU3}1P&YtERm)VsNp;UBdQg2h)H3U{jDZ5!jF`SCJ
z?UGRvrr1ENgJwl(jxsUSo)oB4p-E%gMh!y@JlJ5F8yGBK664Hm!w9R;WRoo2Ndl(^
zY63T3$3nZ`y!&gE&~qn5G9ekE#fRcPbN-}U6V17nE|E`HtuQWLYZ}8?<kl5Y07CO<
zs$1V(+`Dz--+>hn)Gc$u1dFei6jkZAwq$b_#HkO?UmgvzeiA?;^sN{S2?+Q|q7=y+
zvk^hZ1U>~LX9-+EfK<7Yn_wdn0Vnb58*PksEGu8!*jfNW@t_#cWGR3Zf@1wxNLWKf
zMT1k-sHRD?mMAeqjWJqWdsH#8U~19Kl4UDNQb?L&vXoLzC36;RVVYw$ms8HU6m(jU
zx}bGIL@AZ4)KIm?YBkkdOT+SMp=pcFT57qK&Rsel{~o)!o_g+O(7;j}Vd#j%MjCmP
ziM2LmhN&}7n`!1*uG9|IdusGR?rUmvs4Ze)$Jvb<+-7enXl*CDn1L7v0&!aeu%LM{
z^NB*>MQ$<knek94gBt0A(`gX{!7zw*(v{tf+?U*(hCkxQ&&auj?*Aa?7P>?3Bezee
z^|Ie6vH`89aB1pgVq=@^3n%>f@7vg=<QhEn*{xKy?82_##YbJSDd}k2B8HWMuGiML
ztov@@XI5f{Jecd4!_^*3Z8^fm<Rw+C=vZdVuo*FV&!((b@t4;5Zw5ZM&}x+EI^?mb
zK%_%SM^(tv6yGS2utLF95TfaK`nx{{_B7Ew$<{3khO)j`@CMVtRYzBVqy@4+)!+RP
z*waMsN!FfXZCGAi%L2K!CI!f{E%uV#TGzMH&ALa&PwgwwE72>_E72>_-$`T>pDXz1
z*8K;MA7s`5XWd@_001peOjJbx0018!A6{Nww6wH?gM%F%9k{r-8X6k6x3{&mwHX;1
zzP`R392~#Dzab$ZXp!(?00001bW%=J06^y0W&i*H0b)x>L;#2d9Y_EG010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru<pC2GA1PwexL^PP02)a|K~yNuV_*OSMrBt96o4t9
f=FTt*MjQYDiQ54|%i#U_00000NkvXXu0mjf_z?WL

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorSouth.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorSouth.png
deleted file mode 100644
index ac6744d2468c36d9a976e9d5c0a12d58727935b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1140
zcmV-)1dIELP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP5000A_dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHlIti8hTmDmECERf!E(4(ogK{b=ZDZvC*9}L
znR%J24zY!0AwZvOup58>nC>t9DCgjUT8cSFk6*|kb3rBf+wUgHhkf2ZKDTiFpm)~|
zhDspib{WU9FVO3~frX>5k9ueA_({hR`G>A$^}OoGE*(e0H$9zemruJA-c9Em+>YC~
zX+2#BLom9+pRnU0Bp&CmdXaUI6v%ZZ$-HV2b-|q?D(UmsxvTmVysP#UJ711o9z)@L
zJO=S8Mn_Njq?fB3ei#wmdw#f4<?7-??B?ug&T*Sv2@#Qs?o8@!D!T^5icrdK7Eug`
zqHeonl!PfZ5bK~>QJSMnjA%~^)Tz*<v1Ox%AqF07kjxDXmM)2L=C)ykRcNwFmhL2h
zMguj0ny<0Y?l<rL8YT4H36@N7MriS&xX+ZYl*`eaD|Lx{x?+WK@ycloW06~DSOEyl
z6I0#s-Nn7j8~+ZhfS~R$Crq&TdUH{g?zttKv%pS$aQ^makoDsLAwu7Z!H|G}k0eTw
zyfGUQ;+VjvVB{=;D+rJ(cXAVKL?YlMUVWpD(Y9sfn;NecfKWUr1~gd;V1=N_9}5XN
zR8%xLRgG$zG;4_xL(~|f#r2LVCKgOBnpv`JB}ocNQ%sgp%Bf_|f>)U4n9b#sb1ns)
z7Pu~GU0_j4<tjB)t+857HP_ORJ}oqDu~|zkx6-*w$K&5)H`i0oy$l*ir4fdXIBcYm
zN14dADKku+aoS8X&vH>aR3E9)6S-egqeE>G3){}_)Sxzdb3yBMqKg@baUc-4MF0uS
zi<wUp0xxolna_-eLK)OZ7o1Lu7zl<ztdlNwcXGev<}`eX8~==)Tj>4^a&DnJ<UVry
zgjz3qMUf3?J%uZ#UM5~_lQ5WsKi<c$OZRUbd^`Gf^zG=|(f`*`Mg<#WuHBE?wInYi
z#&umrZNWi7JtzfTyZG0o`y)eT#j3=pnoS)|bV%1xvCF51<tkwnvC7?2hK-apkFq{X
zUXbo94Y2B^fs^-RB2KZ?mLuXd5HEbxVB5iE#ttd4(bv$q7g(=-z=kLlOQvQlq_McE
zWertgZCZd5GGM3_zZfXTuSWPOU@l?^8AHMT!b^$>6pom8;6Ph<3LtX7lkQIqe<rb`
zK|<pz8+kpuRgYwvx+I3-L6mWHSrX>`_aNM-Hw4=keC)b^0CC5#hsh~{-2eapDo{*R
zMF7!jA0HoHUS71cw1$R;85tSBzrP_NA-A`;xVX5rwY3@=8XX-S8yg!c{OMc(0004W
zQchC<K<3zH00001VoOIv0Eh)0NB{r;32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rg
z0TUJ=I=-^gf&c&j7D+@wR4C75U>F4>4KS*?q6_%o5&!@rBLP!l@tP9=0000<MNUMn
GLSTaOi}}?6

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorWest.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorWest.png
deleted file mode 100644
index 53747379bc1e0ffc14507f58d2ebbe748189f871..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1047
zcmV+y1nB#TP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0009gdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HEk{l@vhTl1bkAOCo<FH1|4d(d%A?d2F>bApn
zJ0|9#lFEb>LK6CbN;m%fXS#2=C~I<RF@+q0$E8^_7c`Q;uB#@m`?)VZU3h<xyITiC
zB&g+j4ddt+$n8EL>XFw+xr^=CNypIXcrz%=^YV7|(lI1_$?3eie8v@hH=T3O#=G0<
z)%E<Y5y|KVd%})~ka#?Gd69LK6x8d<!ce-}DhW?ndY|Ra-I`CyyS1Kj=gX1HV=9~v
zM<G1r=*Y=F&)v?@`-tf7`Jp3)n~RURn?21ruGtk0$W(A=Qg2h)Ehr+LDtp*67;zig
zahHseFvSL99W*OSbCijZ?MX_V3QZcjZqyK>^5BS?xq-owC5fE5Z2-CoO^%YKJFsAB
zpaveow^(TV&D&q21katI$pmAxXg(MBneb1_&Cr}{=@R*L%N63{wWblqBDbE<0uY)f
zr?&IEi+i_j{5!A$g0|C~Fu~&MWuhA0*OqL~0zLEU{IxYG_G17kf^S1GBp~1eiBTXQ
znIjSMn82qXau($Z0%XRW+yonu062-4Z;Xkwb=mk5<7fd0lOPdjvJ}8lHLRbg32UgB
zm^w2H7A;w}5+rD_5JC*=j4Dy0MvEcFm|~74Nz!B~q?l65sbtQABg}Hh(dCqLE(J~t
zOc#tU&?u#Hm8#WhsIjJ+YiU?MO`EmQVoNQz(z#2=_V1xb*Hh2E3>sKULx+tp;z%Qp
zGO^aCOr18vj5EzV%Z=Kh`bdqQ$o-re9cqi1ZoPP?262pUCTJZewwQq!D}i`i1hAla
zG4qL3d68Spd}eG4V^AYoa5^nwAgF`bCf(TG$^Dd@GyN@Y{3CL1q5B);+(LKAedP8D
zwO;l=iflk@7p|OonK;-c`@#u7|CQQ()xgWp%h3P9P_By4HNl<?eSK>Uw`HTOPqwA@
z$F=+A0W)ynT4{wO>!5mTr*$e9S0)aQIzs+pQ0{jIjDc$Su>;f<RGU|{Dh?f`5RS1g
z!gGI#{>#wI(96(&Xh`slk==I(PM&{E|FC-i001*kOjJbx0018!AA^H~hK7c;w6wRk
zx45{twY9aszrR^oSzcaVVq#()9UU7R8yXrK85tQNAt5XgcToTU00DGTPE!Ct=GbNc
z0004EOGiWihy@);00009a7bBm001r{001r{0eGc9b^rhX2XskIMF-^p76&jQ%_d;*
z0000gNkl<ZILl*T7zINIFfuaYSHQ%?j9&o@3oCvFoSa<v74Y!zjz+|Y0RXtm09gmC
R8cYBH002ovPDHLkV1gc-+*beq

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeFourway.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeFourway.png
index 2acc665ac987619e771dd4c9cb88eb65470dc86b..00579eb1358b55fcb83b592c94215a2f73ad7a12 100644
GIT binary patch
literal 4871
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

delta 2241
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
P0000<MFvhpu0mjfUVlHI