From 5ebd5d9ec07fcf3fd44a95166a44c96066cec852 Mon Sep 17 00:00:00 2001
From: CodedCrow <114866135+CodedCrow@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:15:02 -0400
Subject: [PATCH 1/2] Arachne Plushie added

---
 .../Prototypes/Entities/Objects/Fun/toys.yml  |  28 ++++++++++++++++++
 .../Textures/Objects/Fun/toys.rsi/meta.json   |   3 ++
 .../Objects/Fun/toys.rsi/plushie_arachne.png  | Bin 0 -> 1082 bytes
 3 files changed, 31 insertions(+)
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 67c6e1194b7..65c425c9058 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -750,6 +750,34 @@
     sound:
       path: /Audio/Voice/Human/malescream_5.ogg
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieArachne
+  name: Arachne plushie
+  description: A plushie of an Arachne, a half human, half spider creature. Why does it look familiar?
+  components:
+  - type: Sprite
+    state: plushie_arachne
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Voice/Human/womanlaugh.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Voice/Human/female_sigh.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Human/womanlaugh.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Voice/Human/femalescream_4.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Voice/Human/femalescream_2.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Human/femalescream_5.ogg
+
 - type: entity
   parent: BasePlushie
   id: PlushieMoth
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index fc92a479367..cae7880e414 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -104,6 +104,9 @@
     {
       "name": "plushie_diona"
     },
+    {
+      "name": "plushie_arachne"
+    },
     {
       "name": "plushie_human"
     },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f72c31ddf63918bb07c38ddd189c43ba51d79e1
GIT binary patch
literal 1082
zcmV-A1jYM_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&+DSw~R9J=GmQQFTMHI$=v$&dyh7O$~D20cR5QtF*0=*;(f=a-{h6tkTB4{oi
zB*J=FL?ei&pt5)n)Po2v9y|nuko6#fLSPw|#aWsqCJZ|V7h1y5)23lb3nP|?nd<Go
zlgaLa;0ME0zp8rgtM^{LSMVRBa@2yU#Z_&_qTK@EdVS-_eRoY@YH?MIc8ki)LT>J`
z)kL&g_k>8Hf+yx)(nW@|(7Uy}CXw4bwYaK>$0r9?aM)^c<EPK>n8bZqfoQiNK|t@;
zh{nb#3x{a8P)cclD2h^ZK@c2CEJwh=#QEY%wI_Lm*T1RdNK|GP5M$$r{cWU_vE284
zgb+H4qP|2<WChpj8x_4<<F{|$;=_YZYVP7n6}?+4R3xRuvaI+grDS?~8l@DrZEM@M
zb<w^;4@6_*v|c;MmA_6f(UU#?@{4Re`5ug(1iBu|=1Lfb@z}Dg_+Lti@B08c>y6S7
zTod>6%DeONw;=>4b8AJrh2Qa0AxM&m*9no6l@b7W*qOWi;mq+i@cjorFkG;9XlTfs
zGDQT4<+g1TMN!HNxg0Qf|Dk8uzgq9dFGgi%fj>u2r3@y2{g5NDwR}2GmX#~RDH6Ya
z^hHj=VXGOBgCNMwd!Cn)XTy*pu(f<ztLNrZ3(jp^1K`X%U-L=uz->jnzK}%k%B74e
zrEnalkX(*Hk#aRL%V$5gIlsQfQ_sIpsKo3s#>}aeQb;KY!!Rb{d0zP~SlYZ)*#Zq+
zH(56?b9Q|VfbYKAEH!K@r%65`1h#F*->&OYtyTw1!llhig;nd-u+FD%&KFH}i&JM0
zAU>_<dHBAM>$)hVa9tNEW&a$=Dm~vjJ;3EtXV|}5PlZSC*7*I#kI>mm7Ms`$CI^ym
z9EW68%n?vZX*zq1KKM^czVP&8EPebX(9L{l`AExWWMm|EwK=u%LPjsH>k@`x$_s^s
zNJ`1ATQ|9|wvL*Z1>o!(%iV6*+2hf_eJsnO*=)ug(6~AXf>bUT1VKO$1eHdkp&iGG
zb0J5-C~P*H2=NC82Mqu&tnDy6`wTlfzobsAlro(U&+`CiG#c2pjpI0MZ*QBqiqW6+
zLW+P=O53)L>$=Gns-q~1jU`WI#>Q}_(dfy^Ni$#Cj#C7pC_+jZD=gTovsv7`^MwYo
z@irt~*Nyd*-hv_|4Vi9NW;}`_eBaMyeS&!9*aQqrug^Zg21Sx|E(tU7&tXubK@e1g
z5W1-NB#|O8$RiTE?mw!{!eC_YC<MOmmv*-#dI{HeP2U$$nbJXCyMyA`1mJkdcP~i(
zzws}d<^RRuJqh9f000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g56aB
ASpWb4

literal 0
HcmV?d00001


From 861864228ba805181ddeeb8234d4c4a8e8048ada Mon Sep 17 00:00:00 2001
From: CodedCrow <114866135+CodedCrow@users.noreply.github.com>
Date: Tue, 9 Jul 2024 20:30:24 -0400
Subject: [PATCH 2/2] Added arachne plushie to Crates/fun.yml and
 Spawners/Random/toy.yml

---
 Resources/Prototypes/Catalog/Fills/Crates/fun.yml             | 1 +
 Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index cc5e3b1d174..26d0f47315f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -30,6 +30,7 @@
         amount: 2
       - id: PlushieArachind
       - id: PlushiePenguin
+      - id: PlushieArachne
 
 - type: entity
   id: CrateFunLizardPlushieBulk
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index eba1e300edf..d12b85cde41 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -36,6 +36,7 @@
         - PlushieMoth
         - PlushieMothRandom # Nyanotrasen Random Moth Plushies
         - PlushieArachind
+        - PlushieArachne
       chance: 0.5
       offset: 0.2