From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sun, 14 Jul 2024 10:26:34 +0000 (+0200)
Subject: Fix RGB toys color when worn/in-hand (#30023)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4f479b6c85aec0b775062ece959b34f21171f211;p=space-station-14.git

Fix RGB toys color when worn/in-hand (#30023)

rgbeeeeeeee
---

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 310f92e60c..33a322cb25 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -184,6 +184,19 @@
     energy: 2
   - type: RgbLightController
     layers: [ 0 ]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bee-inhand-left
+        shader: unshaded
+      right:
+      - state: bee-inhand-right
+        shader: unshaded
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: bee-equipped-HELMET
+        shader: unshaded
 
 - type: entity
   parent: BasePlushie
@@ -543,6 +556,15 @@
     energy: 2
   - type: RgbLightController
     layers: [ 0 ]
+  - type: Item
+    heldPrefix: rainbowcarpplush
+    inhandVisuals:
+      left:
+      - state: rainbowcarpplush-inhand-left
+        shader: unshaded
+      right:
+      - state: rainbowcarpplush-inhand-right
+        shader: unshaded
 
 - type: entity
   parent: PlushieCarp
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index fc92a47936..fa118695c2 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -53,6 +53,14 @@
     {
       "name": "rainbowcarpplush"
     },
+    {
+      "name": "rainbowcarpplush-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "rainbowcarpplush-inhand-right",
+      "directions": 4
+    },
     {
       "name": "narplush"
     },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png
new file mode 100644
index 0000000000..8f28f41fd8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png
new file mode 100644
index 0000000000..f12cf346ba
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png differ