diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index 3d1d9be565..24d3521e76 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -156,6 +156,7 @@ food-sequence-cotton-burger-content-plushie-xeno = xeno food-sequence-cotton-burger-content-plushie-penguin = peng food-sequence-cotton-burger-content-plushie-human = uristmc food-sequence-cotton-burger-content-plushie-moth = fluff +food-sequence-cotton-burger-content-plushie-vulp = vulp food-sequence-cotton-burger-content-plushie-ian = corgi food-sequence-cotton-burger-content-among-pequeno = sus diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 88ef9fcdcf..d2f8f71751 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -315,6 +315,9 @@ - id: PlushieMoth prob: 0.01 orGroup: Plushies + - id: PlushieVulp + prob: 0.01 + orGroup: Plushies - id: PlushieArachind prob: 0.01 orGroup: Plushies diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index ab508f57df..53cbcf2624 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -40,11 +40,12 @@ - id: PlushieXeno - id: PlushieHampter - id: PlushieMoth - - id: PlushieMothRandom # Nyano - random moth plushies - - id: PlushieMothRandom # Nyano - random moth plushies - id: PlushieArachind - id: PlushiePenguin - # Begin DeltaV,- see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml + - id: PlushieVulp + # Begin DeltaV - see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml + - id: PlushieMothRandom # Nyano - random moth plushies + - id: PlushieMothRandom # Nyano - random moth plushies - id: PlushieMort - id: PlushieIPC - id: PlushieFelinid @@ -54,8 +55,8 @@ - id: PlushieFeroxi - id: PlushieChitinid - id: PlushieKitsune - # End DeltaV - id: PlushieThaven # IMP port + # End DeltaV - type: entity id: CrateFunPlushie diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml index 6fcf7fd7f8..b3acaa4855 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml @@ -1199,3 +1199,44 @@ - type: Construction # DeltaV - Mothroach hide craft, see Prototypes/Nyanotrasen/Recipes/Crafting/Graphs/fun/mothplushie.yml graph: MothPlushie node: plush + +- type: entity + parent: BasePlushie + id: PlushieVulp + name: vulpkanin plushie + description: An adorable stuffed toy that resembles a vulpkanin. Yip! Yap! + components: + - type: Sprite + sprite: Objects/Fun/Plushies/vulp.rsi + state: icon + - type: EmitSoundOnUse + sound: &PlushieVulpSound + path: /Audio/Voice/Vulpkanin/howl.ogg + params: + volume: -5 + - type: EmitSoundOnLand + sound: *PlushieVulpSound + - type: EmitSoundOnActivate + sound: *PlushieVulpSound + - type: EmitSoundOnTrigger + sound: *PlushieVulpSound + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Vulpkanin/vulp_scream4.ogg + params: + volume: -5 + - type: MeleeWeapon + soundHit: *PlushieVulpSound + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/vulp.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.0625" + - type: FoodSequenceElement + entries: + CottonBurger: PlushieVulp diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 0a04a36406..88d98a18ce 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -114,6 +114,7 @@ - PlushieSnake - PlushieArachind - PlushieMoth + - PlushieVulp - PlushieHampter - PlushiePenguin - PlushieHuman diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml index 343df2b7d6..ef3134bd7b 100644 --- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml @@ -1547,6 +1547,16 @@ - sprite: Objects/Fun/Plushies/moth.rsi state: icon +#Vulp Plushie + +- type: foodSequenceElement + id: PlushieVulp + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-vulp + sprites: + - sprite: Objects/Fun/Plushies/vulp.rsi + state: icon + #Ian Toy - type: foodSequenceElement diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8c77babba8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/icon.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/icon.png new file mode 100644 index 0000000000..453dc25bc8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-left.png new file mode 100644 index 0000000000..1601a78028 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-right.png new file mode 100644 index 0000000000..0847f28475 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/meta.json new file mode 100644 index 0000000000..f77d2b2549 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by Princess Cheeseballs (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}