From 278ab1aa2c1ef5be2e36ed31944951e8ba62237b Mon Sep 17 00:00:00 2001
From: juniwoofs <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>
Date: Sun, 22 Dec 2024 10:28:51 -0800
Subject: [PATCH] yibbie!

---
 .../Prototypes/Entities/Objects/Fun/toys.yml  |  60 ++++++++++++++++++
 .../Objects/Fun/toys.rsi/harpyplushie.png     | Bin 0 -> 1083 bytes
 .../Textures/Objects/Fun/toys.rsi/meta.json   |   6 ++
 .../Objects/Fun/toys.rsi/mortplush.png        | Bin 0 -> 832 bytes
 4 files changed, 66 insertions(+)
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/harpyplushie.png
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/mortplush.png

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index a547f33b59a..b7a1a2a84c3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1966,3 +1966,63 @@
     - type: Sprite
       sprite: Objects/Fun/toys.rsi
       state: shadowkin
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieMort
+  name: Morty plushie
+  description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush.
+  components:
+    - type: Sprite
+      sprite: Objects/Fun/toys.rsi
+      state: mortplush
+
+- type: entity
+  parent: BasePlushie
+  id: Plushieharpy
+  name: harpy plushie
+  description: smells like vanilla and an electrical fire.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: harpyplushie
+  - type: StaminaDamageOnHit
+    damage: 0.8
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio\DeltaV\Voice\Harpy\caw1.ogg
+      params:
+        variation: 0.05
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio\DeltaV\Voice\Harpy\caw1.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio\DeltaV\Voice\Harpy\caw1.ogg
+      params:
+        variation: 0.05
+  - type: EmitSoundOnLand
+    sound: 
+      path: /Audio\DeltaV\Voice\Harpy\caw1.ogg
+      params:
+        variation: 0.05
+  - type: UseDelay
+    delay: 0.8
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 0.5
+    damage:
+      types:
+        Blunt: 0
+    soundHit:
+      path: /Audio\DeltaV\Voice\Harpy\caw1.ogg
+      params:
+        variation: 0.05
+    soundSwing:
+      path: /Audio\DeltaV\Voice\Harpy\caw1.ogg
+      params:
+        variation: 0.05
+    soundNoDamage:
+      path: /Audio\DeltaV\Voice\Harpy\caw1.ogg
+      params:
+        variation: 0.05
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/harpyplushie.png b/Resources/Textures/Objects/Fun/toys.rsi/harpyplushie.png
new file mode 100644
index 0000000000000000000000000000000000000000..d93178d3f7b18e3363bb1de16b5768aa81feaa63
GIT binary patch
literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001r{
z001r{0eGc9b^rha(@8`@R9HvtR!vA0VHke4?8j2ebXzo9Gs6Nc3Jjq-s6ho<q(qk@
zLV|*zP!D<t>L64HGlD#J2!e#DNIO(y9x8~k$e%<h%?;Q5S@XZLV)~w${dQ+}W_L!S
zQ@!vpJ2UV5JkR^{&9}gR``0Vruv>tsD^TK2A>dzs3<_gc#v2jxYlD7P_?80n#QYr%
z@MUl4TRTE51w1K(vNc@;CP7jZ32WB^Jw2MQ&yQ>+!j=Gx3&dq&g<T_wAvxdK5i!rI
zM`{Kp<P<{!--LGUoB}qMzfzYpikS2P%{wEvF2+g#-#c0XWs|W2LzBS4b3sBq7DbUf
zp&$72Ju-`B3uNfMBT)8Mze3IaH%QM&M@h}{sM?!rb5!9ZFMb+%S6H@yEG*$K|8ViX
z_e0pYi)Xhh##C_u6D^XN-`N2rQX6cwAn!381i?2CDsCnLi`|Co4Wc+Ve*5DJkUS$N
z2<UBj2a3^K#oaBMI6mj%j`5o+K7!e*fSz2BLm{bIaqxCbsaI)jbtOnj5JM=w3;V7|
z|0>#=fsdmabVGFsK6|=DNW;nbUYZp-{VaFEqss*$<y+<2h(u?KX+hiD9|oR(ecfc4
zy`=z>$Fw#fB~8N}=mXw}eZA-CX@h|N!8WWOZ&H2eFRvTUMo-eT0yhq5Lz61{D8YD7
z^5JP<p*tHVN)HD_Tsc<-=TczHs!(z}A`AjZe&`k)PfDS9#b;KEXlVlm#g|VCAbWa>
zg5CiKW<Bj#x=`G&0Ad#aiLv4v@Kw7?jQnfnl`yS<o}2(ArjdMH06W)btK`zUUUaBG
zDPsE?`{ax<>;jUr)XbdZy<!Kr#Gj5x<OHE8uIX9e*~ie#iE(K+6fU#Lov(i=$!C55
zpT>YJmpJJ})^EMQ_n%tkw8XG~L9>fonDGs%K9l0x-!Divr)mkXdQ9MWgUuFH7eHYq
zyE3(*dq1K{tZRYeWKpJ)oFMA#??11c0lf`(wX3)5k~LyhkhVn3hP3hrK`|lGER!rX
z0Z8tf5v9#2Q)AO`A5uVgIY%ahYGHjSgnOViAc8-L$@w_bWUNBS3{V++$!r-Y$>T*P
zT%+-YkVJX`e8zWN^z)>Ysj;$p=f!dC)twFcSi=xX^7^q{)OQ*cGeZ*U7oX93dY%Wc
z8A}l_{AZTL4X>Q(VU(MjtK{Vs(^s8bx7!7eXD|?ZwXr*-bwx#m3dtGM+<XU4=Qh>X
zEP-$V5zm6k$_s&Q)6o$mZ)~hJjnVsGyjW#<#)Jzoz1M@<37D(DB_>;8>7;X*tN&cE
z|C;Y_8ndKVRQ5Cq0000EWmrjOO-%qQ00008000000002eQ<DGy002ovPDHLkV1ll7
B<9Yx9

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 cc03557e0b4..7dafd603638 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -389,6 +389,12 @@
         },
         {
             "name": "shadowkin"
+        },
+        {
+            "name": "mortplush"
+        },
+        {
+            "name": "harpyplushie"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png b/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png
new file mode 100644
index 0000000000000000000000000000000000000000..28b3f1c6ebb6524203c1f2a8f42d81ba0c4290dc
GIT binary patch
literal 832
zcmV-G1Hb%<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001r{
z001r{0eGc9b^rhZ*hxe|R9HvtRZmFNK@^^!Wf-P-iCk-m%ven5u!s>s(5XvUh_VD7
zji5Re6kV*m1Y#Ye0>dDv4hzvCyyQ_R2*e<$SPCy&X1CC!A9?t--{d#Gnf?89yY9d;
zzc+8@ec$`u+Zm<mqppCXKxt+sh!Z8r|6hV4_<?Lk5CxLtuLazbhX79db9vDlxpW~Y
zEqztF_B{&o{M$LR9sXJX-7{OGf;^cR4W?)34EV`oy%qtGlV?ZoJ*bILgA5|G>dAE~
zfFg6uusP10I<40+ID?Q&Dvd%_tdTju{xr6zMt?<p{IZ}9c6F+?rWUnrZAE=3EhwoB
zL0Bft7-<!;2oRh>NrK>9CkfaDmfxEpVU>U~7lyBDEGXdnzMe6-F3Z6Z$a2WCB$dG;
zAU8K0AJXQQww-#WofMFMkiajgFDwGTSA7$IX#YN4cMQz1Ipn@1LLgBX?2o+MtR8s%
zVk+3)++<>+2RP7xlECeU&s6h{4ZkEJ8&a02`21y6(_0E09T@gxb_9(BU;VW~4BxUT
zB{+OkLMjq^dALfrnbVdE03hGhZSIAz(qIqHNF^d~FP8+Axjueh$NgUZq32vr&fqLB
z|5UB5Z3=UyBU^<}a5_jLk^tU?=|_)EpmR5`S>SYlgaikPsNTStfxQ`3xHD;RV+qJK
zGTB`wb9bFKm4Tf<-20F4V%aD&IoQvwUial&`aAM53aKH;R{fo3-@MaF$d?p0UQUq4
zfI=6K^o4|sAyAweGY5DBa*Z}0ulZL`4Key88Z&?YZAmXzN?_cvPpAx>KXKOkboYj(
zKt)D#UhdT;sO-mFIfF@_GxEcc`VB8$Ij@5p+TE_%BO8265;AL&<v#k{{gH2hTQCA6
z0DiQ?3M-YuK1v@(b~8<AvInRPwl1@g+Ra-2?OejCOCYmy0bH9UiUTH*)CATWO7}q&
zpe$2ZY3gfr1;P~g3(60JT{Fbtw*UYD4rN$LW=%~1DgXcg2mk;800000(o>TF0000<
KMNUMnLSTYDOKL;_

literal 0
HcmV?d00001