From 0c9c68027a1326e0ac8415d0194bbc1f474dffdf Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=90=D1=80=D1=82?=
 <123451459+JustArt1m@users.noreply.github.com>
Date: Wed, 20 Sep 2023 12:51:08 +0300
Subject: [PATCH] Added corn in butter (#19448)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 .../Objects/Consumable/Food/meals.yml         |  24 ++++++++++++++++++
 .../Recipes/Cooking/meal_recipes.yml          |  13 ++++++++--
 .../Food/meals.rsi/corn-in-butter.png         | Bin 0 -> 794 bytes
 .../Consumable/Food/meals.rsi/meta.json       |   5 +++-
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/corn-in-butter.png

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 0000000000000000000000000000000000000000..aa0f1dd19545e8ed37bec0c4e111240be4590de5
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0+mTbK~z{r?UFxe
z6Hy$;zn4FkKTX6Y#Wc1hjR~Zt3dJf)!3w$v;^3^CtLWk)brI|&B8Y3Li#RGM;vj-)
zDO!Vr#h4Jq7#fnOi6%{Y*Q>c_-s{~pXRoEAgTs9wd~%n2@B4n=98641OiWBn{uDwf
zPcUuEQkf`A{|>s@(wjKjlv-Z>O5~M1k(X2K^ZV~cR<_c?Dc%ycc-M8{%T-X5pWguM
zPN4MzkcG8}S`BbZ_dvX7^|l`bx0-}(iNPXgzy&6CnOh!!wy1`p{t$2<1(s((oTF<G
zv_m`LY~84Qo<=Qq7yX0#AT6cAdxv!P9!TjjEsAxhwbAfK;Q^bx@o@sE-a-q0aLuP^
zzB>u7Rf1T!0ZyDnOZ)_UzXOkp!=BO0sFG7Gl;5#ebGi^z64tRQ)==x_twlC@r%Csv
zc8w(vJ`RUtwcW%R>|GIdZ55udx^2iob{v7%n#BCvGX(rLHu>9h4W+^d+<#oVrbIDx
zbrg$5;whehr|%4#e1jvCtclKAE&lV6D^rGb&o21T+dqWTVw#!rUtl>SBO_X__JxKw
zn@vQ#(?IvdcAd8Y*Kt62zV5EmK=YCILQ%_P1vZj{RDaKER-K%GiMdxPj2(`n=DNZ%
z+-^5>I2=YW7-ZSH15h^>j)C_?;dACTOk`x@Is{I5t-DYEYg)G}I>q+xq^G9`fj~ez
zfc6q*vspNuPI&geKvmey>PzK)sEUKA2m_nCoS)II>GO1*%^fxjA08e?C=_B@Dp~`S
zL?S_Wo<}SegD8qvOrB$t^!7!!ZTrAYWw&+c#B{h!CId;5Fg`x6<?0Tg(s_`7fl;uE
z;Q>_CgV4p)bc#;u^}6AG724uv!6qjE3BWIxP`f+-$?e(z000hUSV?A0O#mtY000O8
Y00000007cclK=n!07*qoM6N<$g5Ex6K>z>%

literal 0
HcmV?d00001

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"
     }
   ]
 }
-- 
2.51.2