Vulp Plushie (#40303)

* Textures

* Plushie

* Fix sprites and add entity tables

* Copyright info

* Fix food sequence

* I'm dum

* head sprite update

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 3d1d9be565c3a0b5aaf74a73b7482ad51c33a4f4..24d3521e76f6ebd4e8728acada078f5de7c574b0 100644 (file)
--- 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 a01ba7c3ff642be845c71912d9724b082b9c25ea..ad65b43684f437eb92a0abf0991b6a2c4c08ad74 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -313,6 +313,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 a582a74835f420452c67470517e1c11b9d30f1ad..77153510200603304a05112396e7e4ee24bf4be1 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -42,6 +42,7 @@
     - id: PlushieMoth
     - id: PlushieArachind
     - id: PlushiePenguin
+    - id: PlushieVulp
 
 - type: entityTable
   id: AllPottedPlantsTable

diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index 17148e771173906b79d423d6f67336b6d03f3663..ad0adebc1595956133b02345d631a8e495aeb2fe 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -1184,3 +1184,44 @@
   - type: FoodSequenceElement
     entries:
       CottonBurger: MothPlushie
+
+- 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 27990fb04a4118345b81ed2069cbf65f4f3c8e28..3b151c5ea5d557a69646f73c5ee5f6fc93fc5546 100644 (file)
--- 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 343df2b7d6d723e54a08a16d6ba82eb4e05a9ba8..ef3134bd7b78751ae0cf44107d2fca4cbbba93a8 100644 (file)
--- 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 (file)
index 0000000..8c77bab
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 (file)
index 0000000..453dc25
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 (file)
index 0000000..1601a78
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 (file)
index 0000000..0847f28
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 (file)
index 0000000..f77d2b2
--- /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
+        }
+    ]
+}