From e190771d099bca2132ce52d497088fd28b561a6a Mon Sep 17 00:00:00 2001 From: Renlou Date: Sun, 4 Jun 2023 04:50:53 +1000 Subject: [PATCH] Add funny hampter plushie (#17099) --- .../Components/SpaceVillainArcadeComponent.cs | 2 +- .../Prototypes/Catalog/Fills/Crates/fun.yml | 1 + .../Prototypes/Entities/Objects/Fun/toys.yml | 21 ++++++++++++++++++ .../Textures/Objects/Fun/toys.rsi/meta.json | 5 ++++- .../Objects/Fun/toys.rsi/plushie_hampter.png | Bin 0 -> 579 bytes 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_hampter.png diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs index 3b54f82dda..262fe2343b 100644 --- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs @@ -57,7 +57,7 @@ namespace Content.Server.Arcade.Components "ToyMouse", "ToyAi", "ToyNuke", "ToyAssistant", "ToyGriffin", "ToyHonk", "ToyIan", "ToyMarauder", "ToyMauler", "ToyGygax", "ToyOdysseus", "ToyOwlman", "ToyDeathRipley", "ToyPhazon", "ToyFireRipley", "ToyReticence", "ToyRipley", "ToySeraph", "ToyDurand", "ToySkeleton", - "FoamCrossbow", "RevolverCapGun", "PlushieLizard", "PlushieAtmosian", "PlushieSpaceLizard", + "FoamCrossbow", "RevolverCapGun", "PlushieHampter", "PlushieLizard", "PlushieAtmosian", "PlushieSpaceLizard", "PlushieNuke", "PlushieCarp", "PlushieRatvar", "PlushieNar", "PlushieSnake", "Basketball", "Football", "PlushieRouny", "PlushieBee", "PlushieSlime", "BalloonCorgi", "ToySword", "CrayonBox", "BoxDonkSoftBox", "BoxCartridgeCap", "HarmonicaInstrument", "OcarinaInstrument", "RecorderInstrument", "GunpetInstrument", "BirdToyInstrument", "PlushieXeno" diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index a08200add8..e8eb6b0cba 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -22,6 +22,7 @@ - id: PlushieAtmosian - id: PlushieDiona - id: PlushieXeno + - id: PlushieHampter - type: entity id: CrateFunInstrumentsVariety diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 1684da371b..1262d30c08 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -106,6 +106,27 @@ - ReagentId: GroundBee Quantity: 10 +- type: entity + parent: BasePlushie + id: PlushieHampter + name: hampter plushie + description: A cute stuffed toy that resembles a hamster. Its face looks squished. + components: + - type: Sprite + state: plushie_hampter + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: entity parent: PlushieBee id: PlushieRGBee diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 188836c3a3..f6af02149a 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", + "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", "size": { "x": 32, "y": 32 @@ -25,6 +25,9 @@ }, { "name": "plushie_h" + }, + { + "name": "plushie_hampter" }, { "name": "plushie_lizard" diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_hampter.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_hampter.png new file mode 100644 index 0000000000000000000000000000000000000000..46ecc5887da1d69eb49eb7972ae0c161f80d9345 GIT binary patch literal 579 zcmV-J0=)f+P)Px${YgYYR9J=Wl`&`&Q5?p9PX${_Na0j0N5rewhF&r_XuvGulsHHRF>Zo_4sN1Q zHw71!*3qGhxCk8_4kw4K2QA{_;ZRZzDrcf;)DYy_ka7;;j--Nl2?rwHw;b>8-T(W& z@Bi){#EKQ`f0r2NrPY;1-*syMbi6M2pS~Ka&d30(D~morzd68mqs`fK1^`!YJsGLy zfpN?`UYCy7WxLVl{f7+zKH3fd_pV>^M*)zc4a@<`HyDzVEX>VfWHpSeMq+A`sl=po5<@B1Ei)|S z*jCtofX`dsIdU|Crl&$k$F}(7)T!6MNu}_|1OoG)q#7eIuq`GV8Fc9ba8Bp&FWS(0BIw`#*7}0gB5Ces%NgJ!gN|qm-$+ilV2Lr z=0gFdFW>#Ghe<`{^!Y1XNK6d01mJD+D`_Lc?#^B`006msNwk_S0KpYtx_q0YqK0F~ zwg7m(_Kw372crWB6!f