Moth-pockets (#34517)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
index fb52cd1c40d2890afc093a8ef4f0d4a080a25b79..05ad0ba725e42e9b1a291a07c68fdd9504e83977 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
@@ -18,5 +18,6 @@
         - FoodBoxDonkpocketBerry
         - FoodBoxDonkpocketHonk
         - FoodBoxDonkpocketDink
+        - FoodBoxDonkpocketMoth
       chance: 0.5
       offset: 0.0

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index c7e46d9a94a040ba6105249642b7123d8da599f9..78543f15e9376b4ae071d0926ebefe0fe72aba31 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -386,3 +386,46 @@
           Quantity: 1
   - type: Sprite
     state: dink
+
+- type: entity
+  name: moth-pocket
+  parent: FoodDonkpocketBase
+  id: FoodDonkpocketMoth
+  description: Buzzy edition of donk-pocket that was created during mass protests ab-... Actually who cares? Just donk-pockets for moths.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - cotton
+    - cheap
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 5
+  - type: Sprite
+    state: moth
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Tag
+    tags:
+    - ClothMade
+    - DonkPocket
+
+- type: entity
+  name: warm moth-pocket
+  parent: FoodDonkpocketMoth
+  id: FoodDonkpocketMothWarm
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Fiber
+          Quantity: 5
+        - ReagentId: Omnizine
+          Quantity: 2

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 7dd402ae6dec1b7d0115b22c183120c215768bf0..e3825ac2dd20fd22999e641d49558f9a0ad384ad 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -484,6 +484,20 @@
     - id: FoodDonkpocketDink
       amount: 6
 
+- type: entity
+  parent: FoodBoxDonkpocket
+  id: FoodBoxDonkpocketMoth
+  name: box of moth-pockets
+  components:
+  - type: Sprite
+    state: moth-box
+  - type: Item
+    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
+  - type: StorageFill
+    contents:
+    - id: FoodDonkpocketMoth
+      amount: 6
+
 - type: entity
   id: HappyHonk
   parent: [ BoxCardboard, BaseBagOpenClose ]

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index e9ddd3b517dab7290257921668f1740f359bf5ce..9a08e3983e656c1b25c02a2198c24583a72f994b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -276,6 +276,8 @@
         orGroup: GiftPool
       - id: FoodBoxDonkpocketHonk
         orGroup: GiftPool
+      - id: FoodBoxDonkpocketMoth
+        orGroup: GiftPool
       - id: ClothingHandsGlovesColorPurple
         orGroup: GiftPool
       - id: ClothingHandsGlovesColorYellow

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 28a47fdc21d4cbb756aaf5baf9dee3f0e4e3e09a..60c7d74c0d97d8452e720aa8749794217ce12d64 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1812,6 +1812,13 @@
   solids:
     FoodDonkpocketCarp: 1
 
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketMoth
+  name: warm moth-pocket recipe
+  result: FoodDonkpocketMothWarm
+  time: 5
+  solids:
+    FoodDonkpocketMoth: 1
 
 - type: microwaveMealRecipe
   id: RecipeHotChili

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
index 3cbfe7d8e826c7055472764e11dac21d32178c6b..77d4d96eb159c9afca313f8b0f0dcabb371f648b 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
@@ -1,76 +1,82 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub), modified by ps3moira (GitHub)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "banana"
-    },
-    {
-      "name": "banana-box"
-    },
-    {
-      "name": "berry"
-    },
-    {
-      "name": "berry-box"
-    },
-    {
-      "name": "dank"
-    },
-    {
-      "name": "pizza"
-    },
-    {
-      "name": "pizza-box"
-    },
-    {
-      "name": "plain"
-    },
-    {
-      "name": "box"
-    },
-    {
-      "name": "spicy"
-    },
-    {
-      "name": "spicy-box"
-    },
-    {
-      "name": "teriyaki"
-    },
-    {
-      "name": "teriyaki-box"
-    },
-    {
-      "name": "dink-box"
-    },
-    {
-      "name": "dink"
-    },
-    {
-      "name": "stonk-box"
-    },
-    {
-      "name": "stonk"
-    },
-    {
-      "name": "carp-box"
-    },
-    {
-      "name": "carp"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub). Modified by ps3moira (GitHub). 'moth-box' and 'moth' States by kosticia on GitHub",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "banana"
+        },
+        {
+            "name": "banana-box"
+        },
+        {
+            "name": "berry"
+        },
+        {
+            "name": "berry-box"
+        },
+        {
+            "name": "dank"
+        },
+        {
+            "name": "pizza"
+        },
+        {
+            "name": "pizza-box"
+        },
+        {
+            "name": "plain"
+        },
+        {
+            "name": "box"
+        },
+        {
+            "name": "spicy"
+        },
+        {
+            "name": "spicy-box"
+        },
+        {
+            "name": "teriyaki"
+        },
+        {
+            "name": "teriyaki-box"
+        },
+        {
+            "name": "dink-box"
+        },
+        {
+            "name": "dink"
+        },
+        {
+            "name": "stonk-box"
+        },
+        {
+            "name": "stonk"
+        },
+        {
+            "name": "carp-box"
+        },
+        {
+            "name": "carp"
+        },
+        {
+            "name": "moth-box"
+        },
+        {
+            "name": "moth"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth-box.png
new file mode 100644 (file)
index 0000000..a9ecf9d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth-box.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth.png
new file mode 100644 (file)
index 0000000..0f68621
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth.png differ