From 68807cb25e167425091035eb0d2be5f3c935758e Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 14 Jun 2024 16:44:23 -0500
Subject: [PATCH] Changes all the uplink ally icons to be a combination of the
 mob + radio (#28954)

* New Icons!

* Better meta info
---
 Resources/Prototypes/Catalog/uplink_catalog.yml |  12 ++++++------
 .../Objects/Devices/communication.rsi/meta.json |  16 ++++++++++++++--
 .../communication.rsi/old-radio-ancestor.png    | Bin 0 -> 1346 bytes
 .../old-radio-borg-assault.png                  | Bin 0 -> 1475 bytes
 .../communication.rsi/old-radio-syndicat.png    | Bin 0 -> 1234 bytes
 .../communication.rsi/old-radio-urist.png       | Bin 0 -> 1496 bytes
 6 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index efec2417d0..d39f900357 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -904,7 +904,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicate
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   cost:
     Telecrystal: 16
   categories:
@@ -920,7 +920,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   cost:
     Telecrystal: 16
   categories:
@@ -936,7 +936,7 @@
   name:  uplink-reinforcement-radio-cyborg-assault-name
   description: uplink-reinforcement-radio-cyborg-assault-desc
   productEntity: ReinforcementRadioSyndicateCyborgAssault
-  icon: { sprite: Mobs/Silicon/chassis.rsi, state: synd_sec }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault }
   cost:
     Telecrystal: 65
   categories:
@@ -952,7 +952,7 @@
   name: uplink-reinforcement-radio-ancestor-name
   description: uplink-reinforcement-radio-ancestor-desc
   productEntity: ReinforcementRadioSyndicateAncestor
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
   cost:
     Telecrystal: 6
   categories:
@@ -968,7 +968,7 @@
   name: uplink-reinforcement-radio-ancestor-name
   description: uplink-reinforcement-radio-ancestor-desc
   productEntity: ReinforcementRadioSyndicateAncestorNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
   cost:
     Telecrystal: 6
   categories:
@@ -998,7 +998,7 @@
   id: UplinkMobCatMicrobomb
   name: uplink-mobcat-microbomb-name
   description: uplink-mobcat-microbomb-desc
-  icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-syndicat }
   productEntity: ReinforcementRadioSyndicateSyndiCat
   cost:
     Telecrystal: 6
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index bfd0e069f3..328747df09 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6",
+  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo",
   "size": {
     "x": 32,
     "y": 32
@@ -69,7 +69,7 @@
       "name": "off-walkietalkie-inhand-left",
       "directions": 4
     },
-	{
+    {
       "name": "old-radio"
     },
     {
@@ -79,6 +79,18 @@
     {
       "name": "old-radio-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "old-radio-syndicat"
+    },
+    {
+      "name": "old-radio-urist"
+    },
+    {
+      "name": "old-radio-ancestor"
+    },
+    {
+      "name": "old-radio-borg-assault"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png
new file mode 100644
index 0000000000000000000000000000000000000000..65ecc4c0d6ea427de5f5a2f024f3b9d79f0c9362
GIT binary patch
literal 1346
zcmV-I1-<%-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGsrmQA0$7gGGZv6hvbf<YEnKkkz8suR!f`uM*N4v@{3}QA=M#
z|3R%mYe5hcK}2J7UrWgCJsK#X=W_1*<2mPfdGB+<9?EHXvtt(Wg`yD-20Y8L6_4|c
zF6=nzq(82i`a)zrO564QfKAnVzv|WgUdz>+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k
z3Lgvm3>i@PM(K$<zbeku`BSkG4bOpH_4H(#IMKvf*2oKw3w!gqlJ+-``Vv>FuoRIx
zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tj<U-A
zf1YM~YO>zl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ
z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j|
z761SM32;bRa{vGf5&!@T5&_cPe*6Fc1A9qCK~z{r?N&`lR8bWE)SU6J937|3nNcS&
zD#-kqFsy_YF+z~GaN$($5(23fK~Qd@%xG7*$riS7XVD@kL0lMAiZhWF1S2u&jHXUb
z;~(af-sarrd%owqXO0qWJn%U8oqNyyzVqFm_kb<iQs6%;5ce<etyU{bPEJNzYAR;u
z<}g1$51-GciWMI#fxf;zwpNbGWRm(%S5-+v<#Bm_%mm8H%Hq^WloS_pV5`LfQ&tw7
zPABs7^SP&Yij#@sL=qcbf{u<3R#Q`>$k(b;UU480*f3_4@<c)&j8w~7T3Yy1Qc}V_
z@Q^WAJ-c5CcJ3gemT%K+L?ybqy7=U6ZEdjGY_ONwQJwoz;OBPZ!814dM}YQ^P+)2j
z*lo3~x!Jz?yi#s!Yb&d-ujlV}yPY{44tTv@PULoOrzW`OX8s#EC9WRR)YQa2?E@37
z?P3LMJP!Vl^e6X3%TMz}DX<=JE#|*}&PrX2VI2~5VTfMrSiK1q1PDAm(}WYJYGb_~
z@Z`}Qo|B!OjmgPL7z_q!j!-BBqtS@5u`wQ#lh~$)^nKi~N+3AXkFYU8lU(E&A{Y!}
zX=w?5zaN&!*(aZplEUNE9|2e7s}h)*`hk(JgCI4gf&rNG3wTm+VG36oZ$=TgT6BR|
zzPPxEq@*OwMXp~0BO_1m6i-MH$kTlxs-Q}M28rP0Mbih8aqsMPO$Eg22#DIG0C~M$
zkLl@Y{^)c%gu`KJ4ow17xkw^yhp?Uo%K@yc><W(wJeStjm}A4_s8^Dm<R@i{wg>Qj
z#-sqJ8Ddi4!<$ZyT3B8Qd7I9AU0od~@#5)Y>@VCErP9!-9uwDuI9*DYg{ia&s3}0e
zqRHFw@xnK)yStnFJo8Q!0wE53=}f7jPgQ~Wxfx`dviU&r^iDQ7@S6LALq`?u;o)Jl
zx3@!|VZ}no$HxqfOmHHir&y%w$gy`b!3(B(52R<TY`mya)(HF>A3(+7y&QCCG$f78
z%Q0{=ulhZB_t~$&R4A}~zcZ3QRy%gYjxXav7J)me&%<msqoJXJ0GZmd(AcOYkbh*>
zOCs`Lz?`*C+`92rN|AxDInAa%#{`_1n27T7a`g1{fJl%v-)#nM%--JKIQkEun7H|t
zPk{O!h^1lz_INy+DK3{wQJhF*Wizf9ZEM_?0{>WnKhO(+TN9`Ib^rhX07*qoM6N<$
Eg1e1|bpQYW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7908a149206d7d43b0b4dbe2292196d6cdbd3c3
GIT binary patch
literal 1475
zcmV;!1w8tRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lk-bYoQ5eR5+J{kwLk%Gf4i*g>Q4oz`kc%~#K~{@izXG+(y-G-H(9$3@L@j*{
z{Rg!Mtp!0)1QCtReJvrk_o$$Rp3AxKkLR4{<-N}Zdnl{r%+6WJ<qJkQ81Sq_S3Qn*
zy0PP69Cu7J^@XMR2yNHTBQ{kZ{Hj;`do5RAB57)1>k*#TbfX|F(-7J!=!*A*2enKr
zA$%h2Gh{&FTcyWq{H8cv<1fWVBs>Rp)zg!1;&>Bl86zh=ChW~+i&}ji^(D?^etAi%
zTlO#}VS)tk5U0onSqk{2<|VV%zKN=DkxlVv^42L~h$Br#ygpHj(lseHC3;exEG3ou
z|2)mq)MTx@GXPz$mi0LTj(w<<E$jExvMOiL@dDTRhJRCXn)w#J+|azo;M#%9n}!xY
zfU8{?de&n`tSWWLwx?3?aRL2N7`TVtwOUs7bIzY2vMs;p4i1lCRPMXh{{Ri-Xb|54
zMbH2M010qNS#tmY4#WTe4#WYKD-Ig~00a9;L_t(oN4-};NK{c2y=tIhI?jk;nxv@=
z5f*}?i-MxCMXL(LAX)`2!d*L8E+PVH<EFOJB3Eux3R=`+7{iiEhSAhCOTy7<5;Z8B
zbDQ&f|Ihz3e<XS^{Quv(@1FC{z3;v^Me+|?C{(v=x=AFy6!~?#&#$4I9f6w<H|p@l
z#y6TNAwNX+OaR~jt_g({bS;t4XLWUz{xW2C^O4vy0jDA)QmCTEg-(DyRv!!mY%4eY
zFch$H=7$q+PXtUSSUKfq9v}pMn{NV<NJJCMT+#gEk`0`oP+&cov^eBa!8d{K?(QNu
z>g+gSIqp4oT0jCSOisPgcdQ=Z7-Pd6FA}~9(AmZ57y8=O)uGQjm(R=DnTSNIQu^y#
zjmyohV>TPkaSKbq1jde^l>WX;5{*u&zm@tXInvW36PthBSGBZCJW#9euz@Y+c(sDJ
zAyzY%_6C^&5I!1~x9!~`>EGZ?%)-GKY-Zzgf;p2?>B=FCz`@35TUj+{?QCx8YFgV`
zWbVU)0@SZ8NaM#@3CCWmY2-kY%mnLXB0Yv}2wM=AbdI<+8v%fSUYhr;<47c|W;hMb
zh7g3-Ry72@6(Y&faw`O|86STpx4tiXDqw--S~<a>fM#?}P$r%}*G$KAVBm(t4EfD5
z*d*50b(gr6WhDUcK&V#ET)5(yEEpKQe^+joq-1#iA+_UnL%dmhPy?_-K!Vj03Jm_N
z%uk@b^OP%rL@FvjYD#qM-RO)yaS&nOvk}ZJK<MMQ*P&#~fmCu`J}txrY9te1rJ<=!
z{U>&kvN*bG0|PjZVZ1wmsSru95IKot)d7Oz$+q}%)dHhKDnJ#`Z>j)7v}Hf$I4fcn
z0j!)P%y?X1ey=3xm<mt@^iu_rF-gD<KAg>$0%c{zy2W_R!f_!A02FiKBX0=Y6xiPW
zCHInl%LBpj^rHY*4Ij=B*phH-GbN$gI<?0W-)v8+8!U;bgx4-G6O!}M2OnY_(-^bW
zfk5zY;yGg#pMGWQaweD=f9DP`Cptr*3S`RfF68%Wr4{9ZO6a@+U%l2ZBO?#ApBE8S
zM)aYXTh*-=SRu%D253k!w_qj|SIiO&a9&2(M;r8Kh-BT83%(DS*Db6RWf=7yV8{u)
zqYq;Yh4FtO|2A|BK}&OZ7Y@yeXC6QVBq8{K3ML86#W#GJ7<n%wn1DFLArg-<$2Sff
z#`V#|$Le@)KBkGCR>T4VaC%&QU_NYVm-9ay+2VBL4F}FCGo8TB>zyYf=3xQ!MY4Hw
z0E_{SC&96D00P(qr&F_^cLR($eWA}Y1eBif8X6j+T2>}=)y}*z`!gZZIcXnO4lop6
d+y1}x{{{lWpDlfW*scHo002ovPDHLkV1n)7p5p)j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png
new file mode 100644
index 0000000000000000000000000000000000000000..702f32fc59962a1bc94423835b05cc203093c448
GIT binary patch
literal 1234
zcmV;@1TFiCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGsrmQA0$7gGGZv6hvbf<YEnKkkz8suR!f`uM*N4v@{3}QA=M#
z|3R%mYe5hcK}2J7UrWgCJsK#X=W_1*<2mPfdGB+<9?EHXvtt(Wg`yD-20Y8L6_4|c
zF6=nzq(82i`a)zrO564QfKAnVzv|WgUdz>+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k
z3Lgvm3>i@PM(K$<zbeku`BSkG4bOpH_4H(#IMKvf*2oKw3w!gqlJ+-``Vv>FuoRIx
zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tj<U-A
zf1YM~YO>zl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ
z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j|
z761SM32;bRa{vGf5&!@T5&_cPe*6Fc0}Dw+K~z{r?N&WZQ&AK?wM41VLaPvgwpIgy
z6s<Z)Q+3fekkrjI#?3f1E*c%&3=Jlo95gN_je~pRCP@dQ3rY$DN`yc_L|SNsQrf=O
z0*R^b9JtTN^WK(LT})5%a_;~4-S3`z?gOY<O@aSefk1a}vE2Ull^dY#k4B?q7sWX@
z^?Dk|e5E)g$5%oERp>u`Mo7A11(2EB?be0EVd0`fb`$k2pLD^L#jI?GwX1hm6#-np
z=ksw%Ajqq34`{(e?Nt*Hkr*}DAeqb4Cf$WCaHiJDqhUMtt4$|5>^9r6lEIdUeNpCy
zLZPDH@25JRd0!zWj3Fd2I5R24rHSRhd1HdXAQ48X*#||SGV@Biir#Nb_5xn&iagh?
zk<5eBlQ4AD1jpOkV179P-mh5*^z;I%<6X=uxVs1-c$1|CE_$z5b#0SxU&7(W2Dmaa
zqReLmSOW$q#zJ^xn6T@3NXc(;E`gLZ23v>p+`j#5KfvO2L+fw^5CrXxv;dFB=HUL>
zPIzi`P+RL_9G<CSfJ;Eiti#g6ET9^h)GBm1x@dB0GXr-Y3~~uPxfK9QED9@jD{Q`b
z4Ytl6m@g#Yz@^JDFDue&sDs$tG_1&VpT%5c3UH6W(RBiH*))M8iAGa1fu`eAAk}BN
z1dJOdXtp|GVfGVT+sG4`)aRiiLCKAyBScDj1Gowx0s}|S2q3^V6|o^W23l0kg6%Ts
zraaUrf0z}orasd(Rg(}BVDh79Ht{|}Mc2805S3XDFd7<2erCp<<fP3J6)Awg%tU3@
zFBS5D9}+<?GA@BaUII(Y5t@S@>u9qd-;wV+bzWG;9DuvLEzA9)!$mQGc4KLR{B|my
zRQPa%u*v*OcJXQRd(7!&+V#WYDh;@|aS$HYf2Z<*u7%Wyd>B`7cPX%w--{S{)tcSf
zLAxHv0X;;KnQ@(44m^C8nHtruy{CB?<(Tt*o(sDkGpu8~_BZX1o?{*(cExb_YGZY6
w9{B47SfF7dQXAH_{{nlGv^J=wz`s`DCq@flV$z0S#Q*>R07*qoM6N<$g8T+N5C8xG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cdf1c61bf02dbef927e6823b658db870070b0a8
GIT binary patch
literal 1496
zcmV;}1t<E6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGsrmQA0$7gGGZv6hvbf<YEnKkkz8suR!f`uM*N4v@{3}QA=M#
z|3R%mYe5hcK}2J7UrWgCJsK#X=W_1*<2mPfdGB+<9?EHXvtt(Wg`yD-20Y8L6_4|c
zF6=nzq(82i`a)zrO564QfKAnVzv|WgUdz>+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k
z3Lgvm3>i@PM(K$<zbeku`BSkG4bOpH_4H(#IMKvf*2oKw3w!gqlJ+-``Vv>FuoRIx
zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tj<U-A
zf1YM~YO>zl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ
z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j|
z761SM32;bRa{vGf5&!@T5&_cPe*6Fc1QAI@K~z{r%~nfjV^tXb)5fOe{hYLUK&uVu
zV{l$dhfydl1VL~ibRjNuIWQX+#f9ji2rk^X9S~&p6&KE83bPnGFR8`HSQ}}BRGY-M
zNt>A5rp?3VdcVItcW#=S^p&bV9R73e{qO&M|Kpr<iT-0ToCSX2=1a2hYrj6%62sVT
z0syyNeou8<xJhy=5^c@EL2$uB`r#HeBhk^W3~0e${P7066&e}QmPL!%HUe;3lGfPw
z!-0?Mw0N!;?6C>V&d#b0rgexESL4%6qPCSLTDr{|YdmjOf)n)sNQ{n->VAt<KNERf
z<<<)PROO$VnySl0G#Zryfq-nc+vSmwkvfg%7;Pzma56qVZV)7VJ|8=;R4Qb(S}Bo8
z)M<~$L)B`Pgq@biiAtb#Ae_40Zra@3B%{$t7K?>UCKHv*Whxen)Y;id4u^v>nGAob
zXcf09f!=VxZpsAsYGT<Sz<YXnXm@v)2S@-+O8|t-W;1`fwzjuZ1PR@f5a0l4)g-X_
zyR?P03WtO&>^rAWD8vy1xKJqY=<4cXdyxs)Hh>%!xgZ5_M4ruNx%LnMpa-<25GBys
zfG9G7EYuMIxWnzESKoO1&>iyC7oRd9<jr>{2x~+KLMQ=9pbRJr01-6+gTbKMuvqJs
zU}HV0OCT%FQN`1#MvI9gN%TwZ8`T~Sm(S-3oi9jeox$E_v#I2D2}t=IrGAeSvXReb
zDA*TaAK7xA-v4Nl=U>J?r<xL-RcWy8SgC<<sZ>%)q|<3KD9Iih8<Wl5-L$3bj1Glp
zDwU$9*RcSH7GlagOP{^-Auqk;V{nhxOCDt%i^cdk(vP~M^P!OmAz`I4g={MXAx#M&
zazVmsce1fFG)#LlqMgidtT#6{2+pwQQGX#=LxjdWkxUXYpp~YVkzNLVemqSWka#@K
zz!;cc8T4~!*J?G6S`4gTc+SD^=I7_tZ)Rp@cmwF}g1*Rk-5#i;eqd2vc|cB^i4y5;
zeiJ@tuABcQmFeDh@rG@$TY{aUL~dUXJA%fVqki&;b>za!4fANoLf^;!q_<wX$TokZ
z()7xuKAwMl_a}Nj{InOe+;ubHa6N6jR#9u;tuB5`gZ(}l9thI?xh3*@ZOR!?<Fz2M
zvYKt3f&JrGMgtyKdYw4y_xyWZ7P|A`SHtC@ki59OO40sax-=9Zg+PPbh7ufh2Q(wr
ztAGs;1R7og{9h5}bd#@Ly(&Xv094Gyb3G!*{wHh|&HTaweK0XmXM#1JpQ*T9E;aIS
zI4plMImsD-##&?ob_a=^`i}@sBa!{PLOBW7*Vh?CxpWMo6n?*7{a3)DmCNN0|06nT
y%9J0EhNy4{00abZHyo5?GI{F2kIL`=Z}$(b7Y0@-ZA3}{0000<MNUMnLSTZ~<iF1V

literal 0
HcmV?d00001

-- 
2.51.2