From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 14 Jun 2024 21:44:23 +0000 (-0500)
Subject: Changes all the uplink ally icons to be a combination of the mob + radio (#28954)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=68807cb25e167425091035eb0d2be5f3c935758e;p=space-station-14.git

Changes all the uplink ally icons to be a combination of the mob + radio (#28954)

* New Icons!

* Better meta info
---

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 0000000000..65ecc4c0d6
Binary files /dev/null and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png differ
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 0000000000..d7908a1492
Binary files /dev/null and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png differ
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 0000000000..702f32fc59
Binary files /dev/null and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png differ
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 0000000000..3cdf1c61bf
Binary files /dev/null and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png differ