diff --git a/Resources/Audio/Items/Toys/licensing.txt b/Resources/Audio/Items/Toys/licensing.txt new file mode 100644 index 0000000000..71f2a7de8a --- /dev/null +++ b/Resources/Audio/Items/Toys/licensing.txt @@ -0,0 +1 @@ +"weh" and "muffled_weh" are licensed under CC0. \ No newline at end of file diff --git a/Resources/Audio/Items/Toys/muffled_weh.ogg b/Resources/Audio/Items/Toys/muffled_weh.ogg new file mode 100644 index 0000000000..0e89f7986d Binary files /dev/null and b/Resources/Audio/Items/Toys/muffled_weh.ogg differ diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 864e30080e..53993e826f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -19,8 +19,14 @@ amount: 1 - id: PlushieLizard amount: 1 + - id: PlushieSpaceLizard + amount: 1 - id: PlushieVox amount: 1 + - id: PlushieRouny + amount: 1 + - id: PlushieRatvar + 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 2b3481f515..41436dba32 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -20,6 +20,9 @@ - PlushieSlime - PlushieSnake - PlushieVox + - PlushieRatvar + - PlushieSpaceLizard + - PlushieRouny - 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 c50c4d6e4e..e268518bfa 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -50,7 +50,17 @@ - type: entity parent: BasePlushie - id: PlushieLizard + id: PlushieRouny + name: rouny plushie + description: Rouny + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_rouny + +- type: entity + parent: BasePlushie + id: PlushieLizard #Weh! name: lizard plushie description: An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleges as you do this plush, with open arms!" components: @@ -70,6 +80,38 @@ - type: UseDelay delay: 1.0 +- type: entity + parent: BasePlushie + id: PlushieSpaceLizard #ᵂᵉʰ! + name: space lizard plushie + description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentCom as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_spacelizard + - type: ItemCooldown + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: UseDelay + delay: 1.0 + +- type: entity + parent: BasePlushie + id: PlushieRatvar + name: ratvar plushie + description: A small stuffed doll of the elder god Ratvar. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_ratvar + - type: entity parent: BasePlushie id: PlushieNar @@ -80,6 +122,7 @@ sprite: Objects/Fun/toys.rsi state: narplush + - type: entity parent: BasePlushie id: PlushieCarp diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 65fa0b967f..366fbf2ac5 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -6,298 +6,307 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "carpplush" - }, - { - "name": "narplush" - }, - { - "name": "plushie_h" - }, - { - "name": "plushie_lizard" - }, - { - "name": "plushie_nuke" - }, - { - "name": "plushie_slime" - }, - { - "name": "plushie_snake" - }, - { - "name": "plushie_vox" - }, - { - "name": "doll" - }, - { - "name": "carpplush-inhand-left", - "directions": 4 - }, - { - "name": "carpplush-inhand-right", - "directions": 4 - }, - { - "name": "doll-inhand-left", - "directions": 4 - }, - { - "name": "doll-inhand-right", - "directions": 4 - }, - { - "name": "AI" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "deathripleytoy" - }, - { - "name": "durandprize" - }, - { - "name": "fireripleytoy" - }, - { - "name": "foamblade" - }, - { - "name": "foamcrossbow" - }, - { - "name": "foamdart" - }, - { - "name": "griffinprize" - }, - { - "name": "foambox" - }, - { - "name": "gygaxtoy" - }, - { - "name": "honkprize" - }, - { - "name": "ian" - }, - { - "name": "marauderprize" - }, - { - "name": "maulerprize" - }, - { - "name": "nuketoy" - }, - { - "name": "odysseusprize" - }, - { - "name": "owlprize" - }, - { - "name": "phazonprize" - }, - { - "name": "reticenceprize" - }, - { - "name": "ripleytoy" - }, - { - "name": "seraphprize" - }, - { - "name": "skeletonprize" - }, - { - "name": "snappop" - }, - { - "name": "spbox" - }, - { - "name": "toy_mouse" - }, - { - "name": "capbullet" - }, - { - "name": "foamcrossbow-inhand-right", - "directions": 4 - }, - { - "name": "foamcrossbow-inhand-left", - "directions": 4 - }, - { - "name": "capgun-inhand-right", - "directions": 4 - }, - { - "name": "capgun-inhand-left", - "directions": 4 - }, - { - "name": "foamblade-inhand-right", - "directions": 4 - }, - { - "name": "foamblade-inhand-left", - "directions": 4 - }, - { - "name": "corgib-inhand-right", - "directions": 4 - }, - { - "name": "corgib-inhand-left", - "directions": 4 - }, - { - "name": "synb-inhand-left", - "directions": 4 - }, - { - "name": "synb-inhand-right", - "directions": 4 - }, - { - "name": "synb" - }, - { - "name": "corgib" - }, - { - "name": "football" - }, - { - "name": "footb-inhand-right", - "directions": 4 - }, - { - "name": "footb-inhand-left", - "directions": 4 - }, - { - "name": "basketball" - }, - { - "name": "bask-inhand-right", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "bask-inhand-left", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "singularitytoy", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "orb", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "orb-inhand-left", - "directions": 4 - }, - { - "name": "orb-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "plushie_ratvar" + }, + { + "name": "plushie_rouny" + }, + { + "name": "plushie_spacelizard" + }, + { + "name": "carpplush" + }, + { + "name": "narplush" + }, + { + "name": "plushie_h" + }, + { + "name": "plushie_lizard" + }, + { + "name": "plushie_nuke" + }, + { + "name": "plushie_slime" + }, + { + "name": "plushie_snake" + }, + { + "name": "plushie_vox" + }, + { + "name": "doll" + }, + { + "name": "carpplush-inhand-left", + "directions": 4 + }, + { + "name": "carpplush-inhand-right", + "directions": 4 + }, + { + "name": "doll-inhand-left", + "directions": 4 + }, + { + "name": "doll-inhand-right", + "directions": 4 + }, + { + "name": "AI" + }, + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "deathripleytoy" + }, + { + "name": "durandprize" + }, + { + "name": "fireripleytoy" + }, + { + "name": "foamblade" + }, + { + "name": "foamcrossbow" + }, + { + "name": "foamdart" + }, + { + "name": "griffinprize" + }, + { + "name": "foambox" + }, + { + "name": "gygaxtoy" + }, + { + "name": "honkprize" + }, + { + "name": "ian" + }, + { + "name": "marauderprize" + }, + { + "name": "maulerprize" + }, + { + "name": "nuketoy" + }, + { + "name": "odysseusprize" + }, + { + "name": "owlprize" + }, + { + "name": "phazonprize" + }, + { + "name": "reticenceprize" + }, + { + "name": "ripleytoy" + }, + { + "name": "seraphprize" + }, + { + "name": "skeletonprize" + }, + { + "name": "snappop" + }, + { + "name": "spbox" + }, + { + "name": "toy_mouse" + }, + { + "name": "capbullet" + }, + { + "name": "foamcrossbow-inhand-right", + "directions": 4 + }, + { + "name": "foamcrossbow-inhand-left", + "directions": 4 + }, + { + "name": "capgun-inhand-right", + "directions": 4 + }, + { + "name": "capgun-inhand-left", + "directions": 4 + }, + { + "name": "foamblade-inhand-right", + "directions": 4 + }, + { + "name": "foamblade-inhand-left", + "directions": 4 + }, + { + "name": "corgib-inhand-right", + "directions": 4 + }, + { + "name": "corgib-inhand-left", + "directions": 4 + }, + { + "name": "synb-inhand-left", + "directions": 4 + }, + { + "name": "synb-inhand-right", + "directions": 4 + }, + { + "name": "synb" + }, + { + "name": "corgib" + }, + { + "name": "football" + }, + { + "name": "footb-inhand-right", + "directions": 4 + }, + { + "name": "footb-inhand-left", + "directions": 4 + }, + { + "name": "basketball" + }, + { + "name": "bask-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "bask-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "singularitytoy", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "orb", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "orb-inhand-left", + "directions": 4 + }, + { + "name": "orb-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_ratvar.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_ratvar.png new file mode 100644 index 0000000000..c95e19bf93 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_ratvar.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_rouny.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_rouny.png new file mode 100644 index 0000000000..568faac605 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_rouny.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_spacelizard.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_spacelizard.png new file mode 100644 index 0000000000..6984c08dba Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_spacelizard.png differ