From 66f32d428959a1c8b5b17bd0f1346bdfbc34e8f0 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Wed, 17 Apr 2024 20:16:48 -0500
Subject: [PATCH] Partially reverts the remote signaller resprite (#27073)

de-sprites the remote signaller
---
 .../Objects/Devices/Electronics/signaller.yml |   8 ++-
 .../signaller.rsi/advanced-inhand-left.png    | Bin 0 -> 352 bytes
 .../signaller.rsi/advanced-inhand-right.png   | Bin 0 -> 344 bytes
 .../Devices/signaller.rsi/advanced.png        | Bin 0 -> 359 bytes
 .../Devices/signaller.rsi/inhand-left.png     | Bin 0 -> 331 bytes
 .../Devices/signaller.rsi/inhand-right.png    | Bin 0 -> 328 bytes
 .../Objects/Devices/signaller.rsi/meta.json   |  50 +++++++++++-------
 .../Devices/signaller.rsi/signaller.png       | Bin 280 -> 315 bytes
 .../Devices/signaller.rsi/signaller2.png      | Bin 461 -> 0 bytes
 9 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Devices/signaller.rsi/advanced.png
 create mode 100644 Resources/Textures/Objects/Devices/signaller.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Devices/signaller.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
index aa889341b1..db4406905a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -32,7 +32,13 @@
   description: A handheld device used for remotely sending signals to objects within a small radius of about 50 meters.
   components:
   - type: Sprite
-    state: signaller2
+    state: advanced
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: advanced-inhand-left
+      right:
+      - state: advanced-inhand-right
   - type: WirelessNetworkConnection
     range: 50
   - type: StaticPrice
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-left.png b/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e04554ef29901ed4c8094fd2361af38341e648c7
GIT binary patch
literal 352
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!LOb!jv*CsZ*SRi9WoF({xM+pE^WVgM~}u9
z2<~Za+C2RuhulHqF9LB&pR_r5h)lZls`|rUom{8S&-X5iodnbm1ZkgR_9X3+4f)g~
z9V`B5ckb^7v)iSG2|sVnGE=)dtJ)^MzfeA@RDmllH~6AF>-wi_vg24y<$Q&w@1A;}
z<%#(UhoDf=t-teLe=44lb;)bVucFB<EBD{sGb>0CVm^>m^WA&@{i{C*VyY{5#=o_C
z&EpiG*{Npw%*TOO)iHUF9{cRs%VyoUvG$|TtLWqxe;ikBN`1F|5laTo<o_-4x+mwf
mglu^zFKjfO1!&d|fkW&eM(O+Bi!VP3vcS{T&t;ucLK6VQ8;leH

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-right.png b/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a7a186080defb190676fdb9dd856257e527a8f
GIT binary patch
literal 344
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!MC0+jv*CsZ*SRh9dZz8d#Ji>Yxo+Q?%ur#
z$`$Oa+4_$KZJN?gDDF9OLY?!5>akcO<@d~r_D|B&%7Wjj0QEC4OnA4seQSGtdO_am
zub*lkZ(g@HGw4NA$<C7B2e+MkQ*rP1(p_zO4Mjh!Dlfj!uJoOK!gWTzSlQ}Tg&$uZ
zyeK;7Li(Oli6x9GNuO?+6uez(vuXc^1s$8kz(xZJg?V@WvcCH*dc}Uh)D+q2QGG?b
z&n!K_w|wr(=?h9G{AxR$#`~3T1&6(^<M#`@zxIB+BK~)=)Za<00@wFDzI<Z+uFJsH
hAupW?Xp)oXOICS@^nK1NKe2;M_jL7hS?83{1ORCgjjI3v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png b/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png
new file mode 100644
index 0000000000000000000000000000000000000000..2383bf5e213980cf5b7e01354549096155bcdf46
GIT binary patch
literal 359
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik_0(?STw=f?`OiYwkl=NWu|B8iW2@})*{|xKbGbHr}^Qj4!GSyczGG;X-
zB$PzN6@{tVYll{O=yP*N7Y2uA`v)X@0*zT8u*DuoiIoKT1^>qe7#J@dcmh<xS>O>_
z%)r2R7=#&*=dVZs3if!qIEGmG-<^0`sM&zSRoClk$m7+2{;!{=z&*pT<Z`dAG+WWL
zNj_4)4%u^w?~=FOBDIGhiq~HJ7T^56X6j)MERMH@l@-b?MCK&29x^mcj%~PNz!{*<
zx}C}7;nK-XyH$Lga#{BmwauAsnW<f&_}Nm&@zAb~6PsINIfVK)J>Y2B9w4squRA+W
cL7<jl{{r9Bugio>f$n1PboFyt=akR{0DZ=S$^ZZW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/signaller.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..011508c4d1ceefb7afd9456be9ade14f0bf95691
GIT binary patch
literal 331
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`032l#}zCMG6ID@yV@OT-n01tfc_+G{f%5RNVk2Fh>x^-Tdtah3%61^<Tv
zhG72+A&_8!M`SSr1K(i~W;~w1A_XY8#M8wwB*Ojew1a#t3Op{`Uu6CN-@VlHao1c!
zDgEjh<qHFT>BM|^tUuAA$)U+!{LRYK{S%hVjBcBoSk%OE%Vf%pIgYH{`@E%Db(^`w
zZrpH?X`0(~*Rjw3S)DG2#*8AHL+ct#3gkIeI8-JmOmJvw;JjdU$D8Gctc$;n*n?mD
z@?KlEvZh8SW&aGUxYl@k(m_6v3sn=Gn!10@I^tf@z#_z=&-zYU#kB57qQAi^pnDlS
MUHx3vIVCg!0L}z=`~Uy|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/signaller.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..751ae9080b7e8c7787d0dc7cce4854e35ba9e83f
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`032l#}zCMG6ID@w){h4DH|1SESh9S~Nv*N!d>2FkC{c&HDgI7@>3g8xGS
zL$H5^5J<4VBeIx*f$uN~Gak=hkpdK4=;`7Z65;-KnxjyI0*9-!_RjyElMlHCr=2j<
z{dfDo0=o;ox_<;Y6a*B0^d?*inyad2C2armgydGs)(X|Uu(uH`g}2wA@y=nbY%woC
zQGNQG(hhF9j<B;@jKvpTEU<A{CUl08k%fsxfJ4ARfroYRqN^)chu=RdcKCx%uu;9~
zoO?5P7*&0vtPZB}KA3yJCSRvCe?j4ijE%D&=mIs=h#1JrxYiy1IU`*I=vW3%S3j3^
HP6<r_h=FmD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
index cefaeebebf..97bbc40162 100644
--- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
@@ -1,21 +1,33 @@
 {
-    "version": 1,
-
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd",
-
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "signaller state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/2c980a1f423f26e990a578bae057d1eca19675ec. inhands & advanced made by Flaregy for Space Station 14. advanced is modified from signaller",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "signaller"
     },
-    "states": [
-        {
-            "name": "signaller",
-            "directions": 1
-        },
-        {
-            "name": "signaller2",
-            "directions": 1
-        }
-    ]
-}
\ No newline at end of file
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "advanced"
+    },
+    {
+      "name": "advanced-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "advanced-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png
index 37a47342a6a0fadd153c1abb049caefe51b50e43..68ff28ad161f79d98cde4a9b092eb6bae72b16f6 100644
GIT binary patch
delta 258
zcmbQiw3}&yW4&2`Pl#(`VxqL7WKwT1pPDeQvjo!t;U!E=)r^c;4G9S)5phLfs`lEU
zRUZ1>+|h->VcGrx$({@h4Br->69!U3B|(0{|Iq=%qy77ZfU=wg9+AZi419+`m{C;2
zs{trj;OXKRV&Q-HqGvT<g8_#_;6{rnR$u>3pQ^;|sdcQkbDyvCFK6-GPrdeRQ~x9~
zRL$EX&mqgF)(|%15F2A;0n-}^r}f2wcMV>|+(-~PCoI?z<RaV3+woq}QhM1;?jkdt
qLpL{YsoywKTJT%kRGy>g9^=+^_MU6Eg<k|(&fw|l=d#Wzp$P!4xnns1

delta 223
zcmdnZG=ph^W4%OxPl&5|sHc#scwnwi%e1N>7LoJ9!iKk885kIBwI^l*DUOmLzu^B6
zz;Lg5ZzNERv%n*=n1O-sFbFdq&tH)O6fE_0aSXBWzdFI2uR(#wW%-YX|ID|o-CQ7|
znCDZWnAv8tfVK2Mi<9$z4T;yS|5;gh)FUP(X!O0?sJ2bz(*&-<eIn5_nMF6TZ|=1W
zVBFo@=WuU+0)Nj*-w%ctMPm%V<afwPOg_%L@0k42865{KCH+D&3>pJoGY0>ZtZ=`z
RBMImN22WQ%mvv4FO#ttBRqX%(

diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png
deleted file mode 100644
index 799a7be6ea974b22c9894c0df067ef0eab6a5f96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$he<?1R9J=WR<TOMP!v6pLMS@LLg-M)&=8jn>2C1@0tLa04*o`=gWxwfICfJI
zgm&ywCl|Xa9UP=sY4d28NTKo^<i#e9ns;N{!JZ{A7v4MP<(_+Uf&UIgc7tZ>T&!8|
zReFCE8Ci12a-nVSK+USSz&TGVVv9-+0QG7u^hK5`06;+gGV;=J(ghfWJOCh{+x;^E
zQu)(No!6_i;QjRGEVU8WUIiqiHQqc(H_%L-+gc?QYu{aw&XVc_^C%g`pd6=fQvgSt
zB0{PPfX~|>mrnw608q0kN=A{C8fgK*S2_L`O9D~~?jL$6@0km+l?nKX@Gz6(*RxS#
zFOd5{v<kYc0|02V8Enr>d@jiYwpIaajKNz9cuN6mj28qYMXF91hl8hg$fSVe0mpJ<
z<ITrQDRO|A0s!a_2eE5ekOc_S^@js=S%)lwEI^n}2ocYf2@r(B58wG>DFP<GA0l)t
z7Zcwn2_XND_X|!acKh5U4JhP^CfX0yHXUuSL0WtO4{C+VTFd?W00000NkvXXu0mjf
D<GH;)

-- 
2.52.0