From 4f479b6c85aec0b775062ece959b34f21171f211 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sun, 14 Jul 2024 12:26:34 +0200
Subject: [PATCH] Fix RGB toys color when worn/in-hand (#30023)

rgbeeeeeeee
---
 .../Prototypes/Entities/Objects/Fun/toys.yml  |  22 ++++++++++++++++++
 .../Textures/Objects/Fun/toys.rsi/meta.json   |   8 +++++++
 .../toys.rsi/rainbowcarpplush-inhand-left.png | Bin 0 -> 15498 bytes
 .../rainbowcarpplush-inhand-right.png         | Bin 0 -> 15496 bytes
 4 files changed, 30 insertions(+)
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png

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 0000000000000000000000000000000000000000..8f28f41fd8513829dc0f926f9bd0fa46f67c05c4
GIT binary patch
literal 15498
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
AJOBUy

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f12cf346ba2dcdd3396d84c4872426f989721e43
GIT binary patch
literal 15496
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

literal 0
HcmV?d00001

-- 
2.51.2