From a16ce4b7a5270e24fbba63ab56d35ef7f3b3d2d6 Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Thu, 26 Nov 2020 13:06:54 +0000
Subject: [PATCH] Replaces the substation sprite. (#2621)

* Sprite

* ez
---
 .../Constructible/Power/power_base.yml        |   9 +++-
 .../Power/substation.rsi/charging.png         | Bin 0 -> 506 bytes
 .../Power/substation.rsi/dead.png             | Bin 0 -> 508 bytes
 .../Power/substation.rsi/full.png             | Bin 0 -> 508 bytes
 .../Power/substation.rsi/meta.json            |  41 ++++++++++++++++++
 .../Power/substation.rsi/screen.png           | Bin 0 -> 301 bytes
 .../Power/substation.rsi/substation.png       | Bin 0 -> 1673 bytes
 7 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Constructible/Power/substation.rsi/charging.png
 create mode 100644 Resources/Textures/Constructible/Power/substation.rsi/dead.png
 create mode 100644 Resources/Textures/Constructible/Power/substation.rsi/full.png
 create mode 100644 Resources/Textures/Constructible/Power/substation.rsi/meta.json
 create mode 100644 Resources/Textures/Constructible/Power/substation.rsi/screen.png
 create mode 100644 Resources/Textures/Constructible/Power/substation.rsi/substation.png

diff --git a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
index b5e285e2a2..04d65e1751 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -120,8 +120,13 @@
   - type: SnapGrid
     offset: Center
   - type: Sprite
-    sprite: Constructible/Power/power.rsi
-    state: storage
+    sprite: Constructible/Power/substation.rsi
+    layers:
+    - state: substation
+    - state: screen
+      shader: unshaded
+    - state: full
+      shader: unshaded
   - type: Battery
     maxCharge: 1000
     startingCharge: 1000
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/charging.png b/Resources/Textures/Constructible/Power/substation.rsi/charging.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf01dbe8dec5cf300f415e708d342d62f806bb4
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq001BW001Bm1^@s6BkHEN0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#MtjEVKw>v4x670zpA6H5O@tNL29EY}P!4Y+QCXNU#-bECLpy
zjjzIgpsir5AP9;eV&O0F)ks+HBtk@Vmf8DpX3k~i4EU1;!*rTrU>03Fm56I|^9x$b
zGeN>M(MFeUIM(>oRFZ$k$1OfpZ=$N#|NH(N!R3r&fUi|}#IS5vcuY9C=30ukgu9Kr
zzASto9I@qq!k0=<*ZE0tuFh|Y?U~dB_*G9W_k+_v*vQ+a@St#?StuFb=TSEaWs0-Y
zQhQ|f;*cUi9E~(3Rw&>Sm0Fa{{`SRczDZWaW60m4j4h5FdGSU>ElJmm)U4<k`3jU(
z?!WVNvcp65?x8p|KYHG4KeTK^wc>f7hn`nGg1`fu7aRUn$!YXm^h!hP+lS5#IK60S
z=^Z%Rgz&wk+j>n3$n<Bk@Nxnj^U!q-?ThuSzSlXvgPC=CqAS?lg8|v!x%35^E@#`?
zt)jaC000SaNLh0L01m?d01m?e$8V@)0000nNkl<ZXx{DBp%DNe5Cg#!PD>0>;lILT
wnb|exW0C*>004aAtUWWTZY=`f1poke*0u~3-6KusrT_o{07*qoM6N<$f-4i`^8f$<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Power/substation.rsi/dead.png b/Resources/Textures/Constructible/Power/substation.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba6f81f1a1af4391ffa77925ce20f2cbd826c670
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq001BW001Bm1^@s6BkHEN0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#MtjEVKw>v4x670zpA6H5O@tNL29EY}P!4Y+QCXNU#-bECLpy
zjjzIgpsir5AP9;eV&O0F)ks+HBtk@Vmf8DpX3k~i4EU1;!*rTrU>03Fm56I|^9x$b
zGeN>M(MFeUIM(>oRFZ$k$1OfpZ=$N#|NH(N!R3r&fUi|}#IS5vcuY9C=30ukgu9Kr
zzASto9I@qq!k0=<*ZE0tuFh|Y?U~dB_*G9W_k+_v*vQ+a@St#?StuFb=TSEaWs0-Y
zQhQ|f;*cUi9E~(3Rw&>Sm0Fa{{`SRczDZWaW60m4j4h5FdGSU>ElJmm)U4<k`3jU(
z?!WVNvcp65?x8p|KYHG4KeTK^wc>f7hn`nGg1`fu7aRUn$!YXm^h!hP+lS5#IK60S
z=^Z%Rgz&wk+j>n3$n<Bk@Nxnj^U!q-?ThuSzSlXvgPC=CqAS?lg8|v!x%35^E@#`?
zt)jaC000SaNLh0L01m?d01m?e$8V@)0000pNkl<ZXx{DBp%DNe5Cg#|N~H>VVyN(6
y;jzr@n)5M900000K5=%|m{qqH0q_C<06c47J`oxHA>ac50000<MNUMnLSTXwMde%o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Power/substation.rsi/full.png b/Resources/Textures/Constructible/Power/substation.rsi/full.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a670ff234ebc44f77d8b1167e4cb614b2095dd
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq001BW001Bm1^@s6BkHEN0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#MtjEVKw>v4x670zpA6H5O@tNL29EY}P!4Y+QCXNU#-bECLpy
zjjzIgpsir5AP9;eV&O0F)ks+HBtk@Vmf8DpX3k~i4EU1;!*rTrU>03Fm56I|^9x$b
zGeN>M(MFeUIM(>oRFZ$k$1OfpZ=$N#|NH(N!R3r&fUi|}#IS5vcuY9C=30ukgu9Kr
zzASto9I@qq!k0=<*ZE0tuFh|Y?U~dB_*G9W_k+_v*vQ+a@St#?StuFb=TSEaWs0-Y
zQhQ|f;*cUi9E~(3Rw&>Sm0Fa{{`SRczDZWaW60m4j4h5FdGSU>ElJmm)U4<k`3jU(
z?!WVNvcp65?x8p|KYHG4KeTK^wc>f7hn`nGg1`fu7aRUn$!YXm^h!hP+lS5#IK60S
z=^Z%Rgz&wk+j>n3$n<Bk@Nxnj^U!q-?ThuSzSlXvgPC=CqAS?lg8|v!x%35^E@#`?
zt)jaC000SaNLh0L01m?d01m?e$8V@)0000pNkl<ZXx{DBp%DNe5Cg$Til!%qzUbj!
y;jzr@n)5M900000J~7T-nN_zI0q_C<06c4ej1xHrU-?P^0000<MNUMnLSTYMb>>X~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Power/substation.rsi/meta.json b/Resources/Textures/Constructible/Power/substation.rsi/meta.json
new file mode 100644
index 0000000000..cffd68eec4
--- /dev/null
+++ b/Resources/Textures/Constructible/Power/substation.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/b63634bc17efe2f09cf06ef0e9a90d24d37f6203",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "substation",
+      "directions": 1
+    },
+    {
+      "name": "full",
+      "directions": 1
+    },
+    {
+      "name": "charging",
+      "directions": 1
+    },
+    {
+      "name": "dead",
+      "directions": 1
+    },
+    {
+      "name": "screen",
+      "directions": 1,
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/screen.png b/Resources/Textures/Constructible/Power/substation.rsi/screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..c28bcbcedae21bd23a78b48befe8d6ab1b651dc1
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgAGW!%qVXKQeQk>978JRyuEJd$K)u|@US%^
zLg2*~r6bi31D70F{9-T1#zTHdiR^)mFU~MY8-14Ar>{6W_RzmQoZd#fK<y0S3#Rv4
z$mi|q*<1PRgnhKb`^qKj>+j{nE~%d!Te(BG@c!wSugf>-O?tgOR;EXN?eqJ`zwDLb
z>ka&W-*DIcZG3`%_kUjYT=DPR64^!1{jV={+y9mEhIjJ({L}NpryMN!WBucu#9jaE
zimUd|H@D?~E&p?(>-qWXoO}PBWLNl|bnw5!uU}h#|8#rwblq*WoL#Fnb5`xWe%=24
u$Gw--Dn5oj+Bg03b#{<5;o!l7%vrion(4(1?|V;zL_J;oT-G@yGywo)(TX|%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Power/substation.rsi/substation.png b/Resources/Textures/Constructible/Power/substation.rsi/substation.png
new file mode 100644
index 0000000000000000000000000000000000000000..45524ad8b114aa6fe8a560c23b30485012ad4d36
GIT binary patch
literal 1673
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
Ta4dk200000NkvXXu0mjf!<8Yu

literal 0
HcmV?d00001