From b76547e6df982232d4c2fa5605e9eaedd2913513 Mon Sep 17 00:00:00 2001
From: Menshin <Menshin@users.noreply.github.com>
Date: Tue, 7 Mar 2023 01:08:03 +0100
Subject: [PATCH] Fixes atmos trinary devices connectors sprites (#14248)

---
 .../Structures/Piping/Atmospherics/trinary.yml  |  16 +++++-----------
 .../Piping/Atmospherics/pipe.rsi/meta.json      |   6 +++++-
 .../pipe.rsi/pipeTrinaryConnectors.png          | Bin 0 -> 469 bytes
 3 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeTrinaryConnectors.png

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index 7462643ee4..adcb622636 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -32,14 +32,12 @@
   placement:
     mode: SnapgridCenter
   components:
-    # TODO ATMOS Improve this sprite and appearance...
     - type: Sprite
       netsync: false
       sprite: Structures/Piping/Atmospherics/gasfilter.rsi
       layers:
         - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeTJunction
-          rotation: -90 # fuck you!!! who cares
+          state: pipeTrinaryConnectors
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: gasFilter
           map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
@@ -82,8 +80,7 @@
     sprite: Structures/Piping/Atmospherics/gasfilter.rsi
     layers:
     - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeTJunction
-      rotation: -90
+      state: pipeTrinaryConnectors
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: gasFilterF
       map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
@@ -125,8 +122,7 @@
       sprite: Structures/Piping/Atmospherics/gasmixer.rsi
       layers:
         - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeTJunction
-          rotation: -90
+          state: pipeTrinaryConnectors
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: gasMixer
           map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
@@ -171,8 +167,7 @@
     sprite: Structures/Piping/Atmospherics/gasmixer.rsi
     layers:
     - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeTJunction
-      rotation: -90
+      state: pipeTrinaryConnectors
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: gasMixerF
       map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
@@ -232,8 +227,7 @@
       sprite: Structures/Piping/Atmospherics/pneumaticvalve.rsi
       layers:
         - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeTJunction
-          rotation: -90
+          state: pipeTrinaryConnectors
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: off
           map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
index b4968add2a..ccf2bd69bc 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
@@ -5,7 +5,7 @@
       "y":32
    },
    "license":"CC-BY-SA-3.0",
-   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
+   "copyright":"pipeTrinaryConnectors made by Menshin for SS14 based on pipeTJunction, the rest is taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
    "states":[
       {
          "name":"pipeTJunction",
@@ -30,6 +30,10 @@
       {
          "name":"pipeConnector",
          "directions":4
+      },
+	  {
+         "name":"pipeTrinaryConnectors",
+         "directions":4
       }
    ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeTrinaryConnectors.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeTrinaryConnectors.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a4683456a18ba997d002946110ece81e7859155
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004;Nkl<Zc-rmS
zF^a-K6b9fwtL6y8fMA<$x}0GS;1N85r3bLI_9$WS0@~T7wHojUio7kBxbEUE%j__Z
zg#T+relv!^%lm-{#u#zV2>>|f#26#UC}sXQ_KS601At7YQ)oz){}%hj$z+1nY6UH+
z@}m#nbUFb5s;WX+me~(LJD-S%h^Y69=Ru+@OPtT=VyG88pU(vVuGj15Fl4PoH&9en
zh4p$p*nfMuTw*jDp>10Lz~yrJ_`o?Q-h1)h%aCvP{eJ(r&TgC@JLjaXYa9-T$AB?Z
zyWI`|V6A<O)5Z6f2_b~RJ_Ba6ncVMpKKY4=h=?ebF-8`Pg?R5}v)M>DX7({ZdNX9L
z1pu^d`(?h)B~^a(0o-mkY`0sryD(LL^Z^`?M>I`SJYFhfmMTALJsv_RLI?nWrfGUT
zK9BqQ!`1r%+SL02+Sm^uA|fLCr>y;eSNr*A8u?lK0YB~Mwez#}177Xtwez#~177Xt
zyU|uFKWjhWFZ+4zd?F$uBBEbt_XASuZ9hQ$0JQr7>Ib0R4@l)5g<T-KGv=7U00000
LNkvXXu0mjf=$PA`

literal 0
HcmV?d00001

-- 
2.52.0