]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix RGB toys color when worn/in-hand (#30023)
authorSlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Sun, 14 Jul 2024 10:26:34 +0000 (12:26 +0200)
committerGitHub <noreply@github.com>
Sun, 14 Jul 2024 10:26:34 +0000 (20:26 +1000)
rgbeeeeeeee

Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Textures/Objects/Fun/toys.rsi/meta.json
Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png [new file with mode: 0644]

index 310f92e60c31c56af39319b7e5476dc14ba730d6..33a322cb25e721329127ba649518beac745a8ecc 100644 (file)
     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
     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
index fc92a479367fcb00cb0609485856772b48749399..fa118695c207c5ca75351ec4ae9513426069355a 100644 (file)
     {
       "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 (file)
index 0000000..8f28f41
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 (file)
index 0000000..f12cf34
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png differ