From a1cc4350caf217a5cacf27b1a24be25ffb57d5fd Mon Sep 17 00:00:00 2001 From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Sat, 19 Jun 2021 15:12:55 -0300 Subject: [PATCH] Vox plushie (#4146) Co-authored-by: DrSmugleaf --- .../Prototypes/Catalog/Fills/Crates/fun.yml | 2 ++ .../Entities/Markers/Spawners/Random/toy.yml | 1 + .../Prototypes/Entities/Objects/Fun/toys.yml | 16 ++++++++++++++++ .../Textures/Objects/Fun/toys.rsi/meta.json | 3 +++ .../Objects/Fun/toys.rsi/plushie_vox.png | Bin 0 -> 716 bytes 5 files changed, 22 insertions(+) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_vox.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index f63fba402a..524bb64cde 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -19,6 +19,8 @@ amount: 1 - id: PlushieLizard amount: 1 + - id: PlushieVox + amount: 1 - type: entity id: CrateFunInstruments diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index b7bcfa81a6..1feba6bdd9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -24,6 +24,7 @@ - PlushieCarp - PlushieSlime - PlushieSnake + - PlushieVox - ToyMouse chance: 0.5 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 42ad54d637..907380c892 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -110,6 +110,22 @@ - type: UseDelay delay: 1.0 +- type: entity + parent: BaseItem + id: PlushieVox + name: vox plushie + description: SKREEEEEEEEEEEE! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_vox + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/Voice/Vox/shriek1.ogg + - type: UseDelay + delay: 1.0 + # This stuff might be copyright claimed by From Software. The sprites are unique # and made by Bright but the sounds are ripped straight from the game. Idk, it's # probably not a big deal. diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 4e62f6aff8..87fb40c4e1 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -28,6 +28,9 @@ { "name": "plushie_snake" }, + { + "name": "plushie_vox" + }, { "name": "doll" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_vox.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_vox.png new file mode 100644 index 0000000000000000000000000000000000000000..99d96b9ccbef9ba62a1ff963d87c17ba8ddfd710 GIT binary patch literal 716 zcmV;-0yF)IP)Px%hDk(0R9J=Wl|M*ZQ5431FDB8()R2duZCW9cp;PHlEK-6~h6-JZ(2_yv;3k5& zb}a>=bP&>^gP5s95GS!XRiUD#kkQ4qNNH#*Nh3BUdC}Y9_Wemq-n;%;3i;sj&O7&V zzwe&&-S?o4HrhA`7H1K8Mc^=-2aeVzP0K2=e zl$Cp$t?+7rr+`QPF|pN`=gzlVP5JP24zT?Y?1E@SiU3d{R}x@~FyneUhtp(kxG({x zhY{sr+^LJZv1c)uAW+Fzt$K=6ko|MUd{J$p0^ ysQi+nVW^Rx8Sz*`q(_q?9!s?RJ-5-ue}mtD4EqnPR11Ot0000