From 3c8fb2e865dc71a750c06c312e2c2684240db4ca Mon Sep 17 00:00:00 2001
From: Smith <182301147+AgentSmithRadio@users.noreply.github.com>
Date: Thu, 13 Feb 2025 03:00:38 -0500
Subject: [PATCH] Grilled Cheese Sandwich Entity and Recipe (#33807)

* Grilled Cheese Prototype

* Typos

* Removed butter reagent to test flavour changes.

* Flavour corrections.

* CC-BY-SA-3.0 attribution

* Fixing meta.json

* I lost an hour of my life to a missing comma in meta.json

* Merge Conflict Rebase and Test Fixing

* Cook time to 10 seconds.

* Sandwich nutritional balance

* Grilled cheese sprite fixed, found the actual original source for copyright.
---
 .../Random/Food_Drinks/food_baked_single.yml  |   1 +
 .../Objects/Consumable/Food/Baked/misc.yml    |  25 ++++++++++++++++++
 .../Recipes/Cooking/meal_recipes.yml          |  11 ++++++++
 .../Food/Baked/misc.rsi/grilled-cheese.png    | Bin 0 -> 816 bytes
 .../Consumable/Food/Baked/misc.rsi/meta.json  |   9 ++++---
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/grilled-cheese.png

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
index fa28567639..052886eadf 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -55,6 +55,7 @@
       - FoodBakedCookieOatmeal
       - FoodBakedCookieRaisin
       - FoodBakedCookieSugar
+      - FoodBakedGrilledCheeseSandwich
       - FoodBakedNugget
       - FoodBakedPancake
       - FoodBakedPancakeBb
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index db8c186856..3999f4c155 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -835,3 +835,28 @@
           Quantity: 2
         - ReagentId: Vitamin
           Quantity: 1
+
+- type: entity         
+  name: grilled cheese sandwich
+  parent: FoodBakedBase
+  id: FoodBakedGrilledCheeseSandwich
+  description: Bread and cheese toasted with butter, perfect for a chilly day in space.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cheesy
+      - bread
+  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/misc.rsi
+    state: grilled-cheese
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 21
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 11
+        - ReagentId: Butter
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 3
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index a33f78cac2..8e2e97a746 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -2137,3 +2137,14 @@
   time: 5
   solids:
     FoodMeatAnomaly: 1
+
+- type: microwaveMealRecipe
+  id: RecipeGrilledCheeseSandwich
+  name: grilled cheese sandwich recipe
+  result: FoodBakedGrilledCheeseSandwich
+  time: 10
+  solids:
+    FoodBreadPlainSlice: 2
+    FoodCheeseSlice: 1
+    FoodButterSlice: 1
+
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/grilled-cheese.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/grilled-cheese.png
new file mode 100644
index 0000000000000000000000000000000000000000..172c16cd0f38c0c3f90b6cb9bd496ee69623af81
GIT binary patch
literal 816
zcmV-01JC@4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%=t)FDR9Hvtl}$)gQ5c5b$pnXHKr99A&mV|rY!(ifKVU)7&rY(j5QR3j3S0!~
zqE-@AG=WeMwFoMr5>0ARE`ltYGSa{>Do`g91x=G?YKF{iyx(*#XKH4gD}e-aHuv0f
z&$;jOz2EoUYr`@R+cN7T4Ul%=|8t;yTdu**35G&34diq<aH4<OazH5`=&a2#-cDwq
z<;X@j>%0hdbs}qh0fuh9fydV@_Z{ayScX^>V5lC(yYD&Jf7XlOvjM#K&%u3Q3nCvU
z1OyYKvd;PEEB&}|^$9lTFTmR~yXd=VVbV><Tz2Dln@dDDRb`ukC@9AKi>Jt3mk-Vf
zF+V<u%<^hkCtTp(OG%OYc5;n`0J=CWHY08H0V6k}`7dd}e4h`Q+m8a_=dwqKqce+v
z#0A)ymu1}XmB!>+L@3ON?G;f$4tqruf^L*Fn0r_gdb)bMM&qU>A%G{>hWeVdQR^!`
zW}ZcyAexv7L<f{B<<+KZ6u;>IhKEy;zx0v<Fu;Tmbl^9P6k(-D++pMjm=26h&Vt?Z
zXe^jI0EL+by1@SCVdV%rfOhLer;1U;>%4e<s1?_T?UEsNK3?=myC67NWz_B&jQQ9Q
zLb<}iR29#)A73_Lysz67=Gwrt0q68eTpMu1S>})HcHBjFK%*;+qP8l0z5i20Gs1H?
zcqt%r9i+I_Expe#BLz8b9xlX!JzM6h_O8I#DZhZ784g>k0YYp&*M`v4V-w`^-4RL2
zjv}WiN+62=DNF!IUJY7zcL<DS03JHs+aiYvp+=;8R@_j+Dr#P{_T|Vn3afMNO|Jwn
z<u1^RkN_0dU&!YwHOgjQn><4Z7$NL(*-b|X#9FdkgeqEgL(hXUFlvtGljB&kI`&Wa
zX~rSXbaB%zAfY(-r1ZnkVP>Wxa$9JNit56gC$d@x(&v@{bP&}EYE5-OBCG!?fT|H*
uRUujxRzOQ~AW<|+Sx*C`9Y{Oy3*iZjFrd1|8vp<R07*qoM6N<$f&c*3$#Gl&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
index 7afea96765..f9e3aef18c 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Muffin-chocolate, muffin-banana and muffin-cherry sprites modified from the original muffin sprite by RumiTiger. Chevrechaud-cotton and croissant-cotton created by JuneSzalkowska",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Muffin-chocolate, muffin-banana and muffin-cherry sprites modified from the original muffin sprite by RumiTiger. Chevrechaud-cotton and croissant-cotton created by JuneSzalkowska. Grilled-cheese created by AdipemDragon, take from tgstation at commit https://github.com/tgstation/tgstation/commit/716c6db05ab9df28fee81ceb7cf2b6c25f21176d.",
     "size": {
         "x": 32,
         "y": 32
@@ -170,10 +170,13 @@
             "name": "croissant-cotton"
         },
         {
-           "name": "muffin-chocolate"
+            "name": "muffin-chocolate"
         },
         {
-           "name": "muffin-banana"
+            "name": "muffin-banana"
+        },
+        {
+            "name": "grilled-cheese"
         }
     ]
 }
-- 
2.51.2