Wearable bee plush (#20623)

* add

* fix

* temporary change, needs fixing

* mayb fix

* actually fix FR

* yes

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 491ae0037a3e67504332e6d322517f90a7c20cf9..1b601c9f95e76f572b6c657750d85a6ea306f8a7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -94,7 +94,11 @@
   description: A cute toy that resembles an even cuter programmer. You'd have to be a monster to grind this up.
   components:
   - type: Sprite
+    sprite: Objects/Fun/toys.rsi
     state: plushie_h
+  - type: Item
+    sprite: Objects/Fun/toys.rsi
+    heldPrefix: bee
   - type: Extractable
     grindableSolutionName: bee
   - type: SolutionContainerManager
@@ -103,6 +107,12 @@
         reagents:
           - ReagentId: GroundBee
             Quantity: 10
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/toys.rsi
+    equippedPrefix: bee
+    slots:
+    - HEAD
 
 - type: entity
   parent: BasePlushie
@@ -168,6 +178,7 @@
     radius: 1.5
     energy: 2
     netsync: false
+
 - type: entity
   parent: BasePlushie
   id: PlushieLizard #Weh!

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bee-equipped-HELMET.png b/Resources/Textures/Objects/Fun/toys.rsi/bee-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..ba56a09
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/bee-equipped-HELMET.png differ

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-left.png
new file mode 100644 (file)
index 0000000..900432e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-right.png
new file mode 100644 (file)
index 0000000..5563fc4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 77a1128149d3c44d40025dd2c3825002a68a67f6..a5f1211666fc08cc8e9bad0ff1782200867fba7c 100644 (file)
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser",
   "size": {
     "x": 32,
     "y": 32
@@ -10,7 +10,7 @@
         {
             "name": "plushie_ratvar"
         },
-               {
+           {
             "name": "plushie_moth"
         },
         {
@@ -29,7 +29,19 @@
         {
             "name": "plushie_h"
         },
-               {
+        {
+            "name": "bee-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "bee-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "bee-inhand-right",
+            "directions": 4
+        },
+       {
             "name": "plushie_hampter"
         },
         {