From: Арт <123451459+JustArt1m@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:51:08 +0000 (+0300)
Subject: Added corn in butter (#19448)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0c9c68027a1326e0ac8415d0194bbc1f474dffdf;p=space-station-14.git

Added corn in butter (#19448)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 0cb21ccf2b..792e1a3e2c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -559,3 +559,27 @@
       - onion
   - type: Sprite
     state: taco
+
+- type: entity
+  name: corn in butter
+  parent: FoodMealBase
+  id: FoodMealCornInButter
+  description: Buttery.
+  components:
+  - type: Food
+    trash: FoodPlate
+  - type: FlavorProfile
+    flavors:
+      - corn
+      - butter
+  - type: Sprite
+    state: corn-in-butter
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 4
+        - ReagentId: Vitamin
+          Quantity: 4
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index bb43beb9fd..3b15730535 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -957,7 +957,7 @@
   id: RecipePopcorn
   name: popcorn recipe
   result: FoodSnackPopcorn
-  time: 5
+  time: 20
   solids:
     FoodCorn: 1
 
@@ -1694,7 +1694,6 @@
   solids:
     FoodSpaceshroom: 1
 
-#cannabis    
 - type: microwaveMealRecipe
   id: RecipeCannabisButter
   name: cannabis butter recipe
@@ -1716,3 +1715,13 @@
     FoodCannabisButter: 2
     FoodSnackChocolateBar: 2
     FoodEgg: 3
+
+- type: microwaveMealRecipe
+  id: RecipeCornInButter
+  name: corn in butter recipe
+  result: FoodMealCornInButter
+  time: 10
+  solids:
+    FoodCorn: 1
+    FoodPlate: 1
+    FoodButter: 1
diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/corn-in-butter.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/corn-in-butter.png
new file mode 100644
index 0000000000..aa0f1dd195
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/corn-in-butter.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
index 7e5df4d53f..c3af1577c8 100644
--- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/meals.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, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks",
   "size": {
     "x": 32,
     "y": 32
@@ -147,6 +147,9 @@
     },
     {
       "name": "yakiimo"
+    },
+    {
+      "name": "corn-in-butter"
     }
   ]
 }