Merge pull request #341 from CptPuddleboat/mozan-plushie

Add Mozan plush to vending machine
ss14Starlight · Feb 21, 2025 · 1f15a19 · 1f15a19
2 parents 6b6c54b + 3b25b2d
commit 1f15a19
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 6 deletions.
diff --git a/Resources/Prototypes/_StarLight/Catalog/VendingMachines/Inventories/plushies.yml b/Resources/Prototypes/_StarLight/Catalog/VendingMachines/Inventories/plushies.yml
@@ -229,6 +229,17 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: VendorPlushieMozan
+  productEntity: MozanPlush
+  cost:
+    NTCredit: 16
+  categories:
+  - SLPlushies
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
 # SLSpecies
 
 - type: listing

diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Fun/toys.yml
@@ -797,3 +797,36 @@
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Items/Toys/weh.ogg
+
+- type: entity
+  parent: BasePlushie
+  id: MozanPlush
+  name: Mozan Plushie
+  description: Just like the real thing, it squeaks if you poke it.
+  components:
+  - type: Item
+    size: Small
+    sprite: _Starlight/Objects/Fun/toys.rsi
+  - type: Sprite
+    sprite: _Starlight/Objects/Fun/toys.rsi
+    state: mozan_plush
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Voice/Moth/moth_squeak.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Voice/Moth/moth_squeak.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Moth/moth_squeak.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Moth/moth_squeak.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Voice/Moth/moth_scream.ogg
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    soundHit:
+      path: /Audio/Voice/Moth/moth_squeak.ogg
diff --git a/Resources/Textures/_Starlight/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 2,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula",
+    "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat",
     "size": {
         "x": 32,
         "y": 32
@@ -68,19 +68,22 @@
             "name": "vika_plush"
         },
         {
-            "name":  "stinky_plush"
+            "name": "stinky_plush"
         },
         {
-            "name":  "jess_plushie"
+            "name": "jess_plushie"
         },
         {
-            "name":  "siffy_plush"
+            "name": "siffy_plush"
         },
         {
-            "name":  "saltho_plush"
+            "name": "saltho_plush"
         },
         {
-            "name":  "ignis_plush"
+            "name": "ignis_plush"
+        },
+        {
+            "name": "mozan_plush"
         }
     ]
 }
diff --git a/Resources/Textures/_Starlight/Objects/Fun/toys.rsi/mozan_plush.png b/Resources/Textures/_Starlight/Objects/Fun/toys.rsi/mozan_plush.png