From d08a9e2b94759c86528fc8772411635567ea94d2 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Sun, 29 Oct 2023 14:55:15 +1100
Subject: [PATCH] Wearable bee plush (#20623)

* add

* fix

* temporary change, needs fixing

* mayb fix

* actually fix FR

* yes
---
 .../Prototypes/Entities/Objects/Fun/toys.yml  |  11 +++++++++++
 .../Fun/toys.rsi/bee-equipped-HELMET.png      | Bin 0 -> 1606 bytes
 .../Objects/Fun/toys.rsi/bee-inhand-left.png  | Bin 0 -> 1355 bytes
 .../Objects/Fun/toys.rsi/bee-inhand-right.png | Bin 0 -> 1341 bytes
 .../Textures/Objects/Fun/toys.rsi/meta.json   |  18 +++++++++++++++---
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/bee-equipped-HELMET.png
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 491ae0037a..1b601c9f95 100644
--- 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
index 0000000000000000000000000000000000000000..ba56a09a595ba80e18e934d0a1a7b95911778866
GIT binary patch
literal 1606
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjKQRB%&n3*T*V3KUXg?B|j-uuOhbq
ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~%
zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?x<p{1pzzJZaxk&!M?g>G?W
zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$
z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F
zXfoK|;*u17BnA3L1_l<o21dF@milo20iAD?l5ACyS(1|q4mh}fz#-_EQ-UfAQV$A(
zoJ>&2TID3>rQ0f1=%%EmC6?xtDA{F{<|gLZ=tGpCYK4fRnrNes#c~^vm#rd$Qj7C*
zN<o2cXK88!4hIxLMCd~_L}1f^EQqclAS1sdADEbmGLt>?N>Ymoihv0VY@ZR-I@~JI
z%|h56nwME(2QvUo7)cjW#8^2Nm6YcfWru(x0UClh<)LOkLK7)vLXtf=<bmnlj>|?L
zo`>wX%#G9R7#Nu1JzX3_Dj46++V3arC~)lgip33|7#bT~1SMTP6rBXk>VuxJI!)0!
z64YhGw=$^F<slO%C)bJ#jW05ImU?^mKbibKEB{-x@iDRLOHJ<={Pf$DpO;s@@8<mS
zyJtFV9#s8KyL08)vYvde+`LN<_P&n|+&AyvlJLixUw*%Cn6Y!kZvX8+4?BHSzdAo)
z1LNMGH^Y}@7q2+uGb8KiR&lS6HxVZkdRE@k6XLf2_4i?3l*q}2wPw>xr@P$a+d2D#
zg}0(}yvn4__SuuR23y|$^@i!&A0_^){A?fey<<L@oLurv``vn_P1lakKR#*O+WT_-
zv)A0M4_{JPyn23QZH&JCTi5Qe??+GNiMS?*+3SYJf2r9nb$wa!raY^U(--=${&@W@
zgKYSdM}ppuovw>V|Ft@2o~9z-=b#=}Uf(qJW#>Yb4?Xem_xn|*7+aQPxA&c%xNtU$
zM+0Hx#JRvE)UB4!aP`#Xx`*#ae@=)$u)+3e6|39I%lCy(7cv-lJzUi<$M|)nefp~F
zvN3Y+&0cT&GWW!%V=K9rn5|l((W#$5$79dlSE8DiDz|Oc+WLOuRiBs}qO<#_J((!|
zr$K0yBn!iBeeWRg&jp|Nu0Hyh(QKAT)wiZI_0|PtGvnXyd)IB2u|S={@`2PA<J+qP
zei*v=Gi;N3C(zPst+#cn`-11X&v#$laq6mjKSN*JH!hKRj7`}Av0LoypVt~pUn=;k
mbzU*=6*Wd71wu$;_JR7$Zq1oKN*nfo%5YCtKbLh*2~7Y`)IP}o

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..900432e394518148aa201540e48b78148c7c6acf
GIT binary patch
literal 1355
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjKQRB%&n3*T*V3KUXg?B|j-uuOhbq
ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~%
zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?x<p{1pzzJZaxk&!M?g>G?W
zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$
z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F
zXfoK|;*u17BnA3L1_l<o21dF@milo20iAD?l5ACyS(1|q4mh}fz#-_EQ-UfAQV$A(
zoJ>&2TID3>rQ0f1=%%EmC6?xtDA{F{<|gLZ=tGpCYK4fRnrNes#c~^vm#rd$Qj7C*
zN<o2cXK88!4hIxLMCd~_L}1f^EQqclAS1sdADEbmGLt>?N>Ymoihv0VY@ZR-I@~JI
z%|h56nwME(2QvUo7)cjW#8^2Nm6YcfWru(x0UClh<)LOkLK7)vLXtf=<bmnlj>|?L
zo`>wX%#G9RfSEPL)5S5Qg7NK5UoU1ukpmxZxP~{$eqhkr5$K(-VA~|Ww?W&st4Un*
z#=QmM8ckbnuVX1+6uYzPt@fTqCnw{XQ-Xf-Pw|PHH2qBf%ba<|F&qjF3{2>R3U|zQ
z|0CNiM82QB8j(?_A$Lkx*uG<CNb0$xFDLr2l|P+y`uD=w=jycHPuBLYoRE9}MPq6I
z{Xl=K=dCAxIIcSvwdil^j?Bli&n13-_3Y-B{$BGp%krvgA}nnGJiorW`u+VimumOi
zwR)@nxZX;x_~|L(&C}1FWK-}9TmS2E@%6L&pFe&7a%uES{R!IsItRj@-8_Ek))n8J
zy<1mSMzmwP7Rd)2-ZL%i3e<R4eeYCicKoE+V_OtvFP7PVI^E-zb-1K$bg9Kl%`BZ$
zp>Fr18|nky)_-JLqr0_#-q!5q5&;JWMiwyfhl#t%bq%lo)Op|n(9_k=Wt~$(69DGh
B#f|^~

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..5563fc4d3c665cffaa23801cb571c86edfbd7203
GIT binary patch
literal 1341
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjKQRB%&n3*T*V3KUXg?B|j-uuOhbq
ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~%
zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?x<p{1pzzJZaxk&!M?g>G?W
zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$
z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F
zXfoK|;*u17BnA3L1_l<o21dF@milo20iAD?l5ACyS(1|q4mh}fz#-_EQ-UfAQV$A(
zoJ>&2TID3>rQ0f1=%%EmC6?xtDA{F{<|gLZ=tGpCYK4fRnrNes#c~^vm#rd$Qj7C*
zN<o2cXK88!4hIxLMCd~_L}1f^EQqclAS1sdADEbmGLt>?N>Ymoihv0VY@ZR-I@~JI
z%|h56nwME(2QvUo7)cjW#8^2Nm6YcfWru(x0UClh<)LOkLK7)vLXtf=<bmnlj>|?L
zo`>wX%#G9RfSEPS)5S5Qg7NK5$E-sRA`K7I#n-WDe_@Dvu`INz`H^7MSEksl?wJe4
z1+Pd~v<7MHDh(|NzcO|8a%CT}G`S-zvo-%T8azAu<Jr^hw9hUU0uBs}Ea=39cE4a}
zo-ms&+j?e%&KE5=4O`=sA6+`PxBBFl*m|YUM^DAf*U|au{BTz+Q#t?Zmk#gqrB=;9
ze{0{qkn+9!;eTsRexG^k-u2R~yW+=ZuFK*rJXtqQ{*!5qjZc05yd$yiA4i+ZKc2Y#
zok&BMT-_`E{Meg+@+N)$x>x#Z`~#iR-_zUWlWRULoK>^8j%Tf68v_%ELIW-$fiogj
zOgrysr*2))?%Srm|C3MeF{rwCt@vT@e+9=?)-tz@^Iuy|(cTuJ*06cYyyVFzqWbG!
l{xp33J)#|MrohYtd@J9q;XP7%whB~qdAj<!taD0e0s!*mx=;WB

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 77a1128149..a5f1211666 100644
--- 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"
         },
         {
-- 
2.51.2