Merge pull request #245 from iaada/donk-flavor

cloth-pocket
impstation · Sep 12, 2024 · 4e7cb74 · 4e7cb74
2 parents 27c205b + ac167d4
commit 4e7cb74
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 2 deletions.
diff --git 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
+        - FoodBoxDonkpocketCloth
       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
@@ -435,3 +435,46 @@
           Quantity: 1
   - type: Sprite
     state: dink
+
+- type: entity
+  name: cloth-pocket
+  parent: FoodDonkpocketBase
+  id: FoodDonkpocketCloth
+  description: Imitation donk-pockets woven from cheap cloth.
+  components:
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: FlavorProfile
+    flavors:
+      - cheap
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 3
+  - type: Sprite
+    state: cloth
+  - type: Tag
+    tags:
+    - DonkPocket
+    - ClothMade
+
+- type: entity
+  name: warm cloth-pocket
+  parent: FoodDonkpocketCloth
+  id: FoodDonkpocketClothWarm
+  description: Imitation donk-pockets woven from cheap cloth and burnt to perfection.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cheap
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 8
+        - 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
@@ -470,6 +470,21 @@
     - id: FoodDonkpocketDink
       amount: 6
 
+- type: entity
+  parent: FoodBoxDonkpocket
+  id: FoodBoxDonkpocketCloth
+  name: box of cloth-pockets
+  description: A box of imitation donk-pockets made of cloth.
+  components:
+  - type: Sprite
+    state: cloth-box
+  - type: Item
+    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
+  - type: StorageFill
+    contents:
+    - id: FoodDonkpocketCloth
+      amount: 6
+
 - type: entity
   id: HappyHonk
   parent: [ BoxCardboard, BaseBagOpenClose ]

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1630,6 +1630,14 @@
   solids:
     FoodDonkpocketCarp: 1
 
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketCloth
+  name: warm cloth-pocket recipe
+  result: FoodDonkpocketClothWarm
+  time: 5
+  solids:
+    FoodDonkpocketCloth: 1
+
 
 - type: microwaveMealRecipe
   id: RecipeHotChili
@@ -2058,4 +2066,4 @@
   solids:
     FoodCroissantRaw: 1
     FoodButterSlice: 1
-    ShardGlass: 1
+    ShardGlass: 1
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/cloth-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/cloth-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/cloth.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/cloth.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "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).",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub). Cloth pocket by iaada (GitHub).",
   "size": {
     "x": 32,
     "y": 32
@@ -64,6 +64,12 @@
     {
       "name": "carp"
     },
+    {
+      "name": "cloth-box"
+    },
+    {
+      "name": "cloth"
+    },
     {
       "name": "inhand-left",
       "directions": 4