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 0000000000..46ecc5887d Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_hampter.png differ