From 278ab1aa2c1ef5be2e36ed31944951e8ba62237b Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 10:28:51 -0800 Subject: [PATCH 1/7] 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)L64HGlD#J2!e#DNIO(y9x8~k$e%tsD^TK2A>dzs3<_gc#v2jxYlD7P_?80n#QYr% z@MUl4TRTE51w1K(vNc@;CP7jZ32WB^Jw2MQ&yQ>+!j=Gx3&dq&g#=fsdmabVGFsK6|=DNW;nbUYZp-{VaFEqss*$$Fw#fB~8N}=mXw}eZA-CX@h|N!8WWOZ&H2eFRvTUMo-eT0yhq5Lz61{D8YD7 z^5JP zg5CiKW;jUr)XbdZyYJmpJJ})^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+X zEP-$V5zm6k$_s&Q)6o$mZ)~hJjnVsGyjW#<#)Jzoz1M@<37D(DB_>;8>7;X*tN&cE z|C;Y_8ndKVRQ5Cq0000EWmrjOO-%qQ00008000000002eQs(5XvUh_VD7 zji5Re6kV*m1Y#Ye0>dDv4hzvCyyQ_R2*e<$SPCy&X1CC!A9?t--{d#Gnf?89yY9d; zzc+8@ec$`u+ZmdAE~ zfFg6uusP10I<40+ID?Q&Dvd%_tdTju{xr6zMt?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&TF0000< KMNUMnLSTYDOKL;_ literal 0 HcmV?d00001 From 3254d28ea2930bc460b946e48f6c520fe43207be Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 10:29:47 -0800 Subject: [PATCH 2/7] awa --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index b7a1a2a84c3..72c10d15bff 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1981,7 +1981,7 @@ parent: BasePlushie id: Plushieharpy name: harpy plushie - description: smells like vanilla and an electrical fire. + description: A soft plushie of a harpy! A small tag on it guarantees that all feathers are ethically sourced. components: - type: Sprite sprite: Objects/Fun/toys.rsi From e6eb1c48a258ef9f4a19440f51e2aa96e1ae4639 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 10:34:49 -0800 Subject: [PATCH 3/7] quick change --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 72c10d15bff..521203dd88e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1979,7 +1979,7 @@ - type: entity parent: BasePlushie - id: Plushieharpy + id: PlushieHarpy name: harpy plushie description: A soft plushie of a harpy! A small tag on it guarantees that all feathers are ethically sourced. components: From 9697c097db4c7ac80f5bdb718d9352f1230b33b3 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 10:36:15 -0800 Subject: [PATCH 4/7] formatting fix2 --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 521203dd88e..5cddedd9e0e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1990,20 +1990,20 @@ damage: 0.8 - type: EmitSoundOnActivate sound: - path: /Audio\DeltaV\Voice\Harpy\caw1.ogg + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg params: variation: 0.05 - type: EmitSoundOnUse sound: - path: /Audio\DeltaV\Voice\Harpy\caw1.ogg + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg - type: EmitSoundOnCollide sound: - path: /Audio\DeltaV\Voice\Harpy\caw1.ogg + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg params: variation: 0.05 - type: EmitSoundOnLand sound: - path: /Audio\DeltaV\Voice\Harpy\caw1.ogg + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg params: variation: 0.05 - type: UseDelay @@ -2015,14 +2015,14 @@ types: Blunt: 0 soundHit: - path: /Audio\DeltaV\Voice\Harpy\caw1.ogg + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg params: variation: 0.05 soundSwing: - path: /Audio\DeltaV\Voice\Harpy\caw1.ogg + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg params: variation: 0.05 soundNoDamage: - path: /Audio\DeltaV\Voice\Harpy\caw1.ogg + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg params: variation: 0.05 \ No newline at end of file From f60323677bc9c0e190fa5339debd6fa5c30caff8 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 10:37:32 -0800 Subject: [PATCH 5/7] yet another format fix --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 5cddedd9e0e..d5ee3e0b4d5 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1970,7 +1970,7 @@ - type: entity parent: BasePlushie id: PlushieMort - name: Morty plushie + name: morty plushie description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. components: - type: Sprite From a7febbf4c9d9543c047e26fd5545e43cc7f1b013 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Sun, 22 Dec 2024 14:46:38 -0400 Subject: [PATCH 6/7] Update toy.yml Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> --- Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 96b5f7aa8c5..eeb9b5bcbae 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -69,6 +69,8 @@ - PlushieTrystan - PlushieSlips - PlushieJester + - PlushieHarpy + - PlushieMorty chance: 0.5 offset: 0.2 From a2f04758381ee476dd8c16bb8489600aca4aab46 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Sun, 22 Dec 2024 14:47:54 -0400 Subject: [PATCH 7/7] Update toy.yml Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> --- Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index eeb9b5bcbae..62c9e48ca65 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -70,7 +70,7 @@ - PlushieSlips - PlushieJester - PlushieHarpy - - PlushieMorty + - PlushieMort chance: 0.5 offset: 0.2