a fistful of plushies (#2591)

* a fistful of plushies * Update toys.yml * Make the mail ones rare * Update lathe.yml * Update cuddlycritter.yml --------- Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Dec 21, 2024 · 878bda0 · 878bda0
1 parent f1545cc
commit 878bda0
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 1 deletion.
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
@@ -60,6 +60,9 @@
     CrazyGlue: 1
   emaggedInventory:
     PlushieJester: 3
+    PlushieJanitor: 3
+    PlushieMailVulp: 3
+    PlushieYarrMoth: 3
     PlushieNuke: 3
     PlushieRGBee: 3
     BalloonCorgi: 2

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
@@ -420,6 +420,26 @@
     sprite: _NF/Objects/Fun/toys.rsi
     state: plushie_vulp
 
+- type: entity
+  parent: BasePlushieVulp
+  id: PlushieMailVulp
+  name: mail vulp plushie
+  description: Smells minty and reminds you of unopened mail. You should check your mail!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/toys.rsi
+    state: plushie_mailvulp
+
+- type: entity
+  parent: BasePlushieMoff
+  id: PlushieYarrMoth
+  name: yarr moth plushie
+  description: It's dastardly and has a dashing cloak. It chitters when you squeeze it!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/toys.rsi
+    state: plushie_yarrmoth
+
 - type: entity
   parent: BasePlushieVulp
   id: PlushieCorgi

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -1207,6 +1207,8 @@
       - NFPlushieEngineerRecipe
       - PlushieJesterRecipe
       - PlushieJanitorRecipe
+      - PlushieYarrMothRecipe
+      - PlushieMailVulpRecipe
       - PlushieNukeRecipe
       - PlushieRGBeeRecipe
       - BalloonCorgiRecipe

diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml
@@ -537,6 +537,12 @@
     - id: PlushieJester
       prob: 0.05
       orGroup: Plushie
+    - id: PlushieMailVulp
+      prob: 0.05
+      orGroup: Plushie
+    - id: PlushieYarrMoth
+      prob: 0.05
+      orGroup: Plushie
 
 - type: entity
   categories: [ HideSpawnMenu ]

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml
@@ -86,6 +86,16 @@
   result: PlushieMoff
   parent: BasePrize15Recipe
 
+- type: latheRecipe
+  id: PlushieMailVulpRecipe
+  result: PlushieMailVulp
+  parent: BasePrize15Recipe
+
+- type: latheRecipe
+  id: PlushieYarrMothRecipe
+  result: PlushieYarrMoth
+  parent: BasePrize15Recipe
+
 - type: latheRecipe
   id: PlushieMoffsicianRecipe
   result: PlushieMoffsician

diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server.",
+    "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server. Yarrmoth and Mailvulp by lvl1eevee (Discord)",
     "size": {
         "x": 32,
         "y": 32
@@ -46,6 +46,12 @@
         {
             "name": "plushie_construction"
         },
+        {
+            "name": "plushie_yarrmoth"
+        },
+        {
+            "name": "plushie_mailvulp"
+        },
         {
             "name": "gnome"
         }

diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png
diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png