From 8478125fe87b2c25c63ea9ad6ed023f49eaa887c Mon Sep 17 00:00:00 2001
From: Smith <182301147+AgentSmithRadio@users.noreply.github.com>
Date: Wed, 23 Apr 2025 23:24:37 -0400
Subject: [PATCH] Cotton Grilled Cheese Sandwich (#36135)

* Working entity.

* New sprite by MadeOfHeartAndStone

* Removed deadspace, changed attribution in meta.json

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
---
 .../Random/Food_Drinks/food_baked_single.yml  |   1 +
 .../Objects/Consumable/Food/Baked/misc.yml    |  33 ++++++++++++++++++
 .../Recipes/Cooking/meal_recipes.yml          |   9 +++++
 .../Baked/misc.rsi/grilled-cheese-cotton.png  | Bin 0 -> 1003 bytes
 .../Consumable/Food/Baked/misc.rsi/meta.json  |   5 ++-
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/grilled-cheese-cotton.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 052886eadf..88506d33a6 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
@@ -56,6 +56,7 @@
       - FoodBakedCookieRaisin
       - FoodBakedCookieSugar
       - FoodBakedGrilledCheeseSandwich
+      - FoodBakedGrilledCheeseSandwichCotton
       - 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 e6882fa621..c7a10d4212 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -862,6 +862,39 @@
         - ReagentId: Vitamin
           Quantity: 3
 
+- type: entity
+  parent: FoodBakedBase
+  id: FoodBakedGrilledCheeseSandwichCotton
+  name: cotton grilled cheese sandwich
+  description: Cotton bread slightly burnt in butter, with melted cheese. Moths find it difficult to resist this combination.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - cheesy
+    - bread
+    - cotton
+  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/misc.rsi
+    state: grilled-cheese-cotton
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: Tag
+    tags:
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 21
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Fiber
+          Quantity: 5
+        - ReagentId: Butter
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 3
+
 # Entity Tables
 
 - type: entityTable
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 60c7d74c0d..589d98e34b 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -2366,3 +2366,12 @@
     FoodCheeseSlice: 1
     FoodButterSlice: 1
 
+- type: microwaveMealRecipe
+  id: RecipeGrilledCheeseSandwichCotton
+  name: cotton grilled cheese sandwich recipe
+  result: FoodBakedGrilledCheeseSandwichCotton
+  time: 10
+  solids:
+    FoodBreadCottonSlice: 2
+    FoodCheeseSlice: 1
+    FoodButterSlice: 1
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/grilled-cheese-cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/grilled-cheese-cotton.png
new file mode 100644
index 0000000000000000000000000000000000000000..8295ed11ad5c2e059235cadce45449fa63a661a2
GIT binary patch
literal 1003
zcmV<H0~Gv;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&i%CR5R9HvtRclC-VHAFrSzB%7Mixy<vyf=HT7}vwOAJd^(1k1_qk`;DPzi-y
zBq)NG6a)p4U||<3tt?X05Gr$NU{@9;sa?n*<6F4dhL^rL$KEk*&S^g+@cj91?|Yuh
zIp_Tp801h4GCqa~3_0-sIdCLCT&Br!x?J4`NTXIGyQaC{f`Z;quu><#{ThOuJ0j6;
zI)KpUN1>dkhjZ)}=%VZ3yitHtr$6?aM4tp+r9pnzrbBYxd$hE);JbARjO(Vu^SOzM
z=#=;1d{PU|nzeA8ufdu8N=%#3iM2&ipSj7xfQ$ATRPw<r1L|x)5MvHQho#(WyWI2;
zI>Smx_97_si=ckB8KH6W(f+gw<*p1&%3scFjn@NX^h!X06R1|13x{VLREkzqRK3K!
zsCEV=60AbM2wJTc4u^x+N)0jWjO1B{FNaqJB;uDq@;Ie@>%<JUm1@f*w6EcC#CB^u
zB0%6GXbtMG0QzVq(RgMLm&;|mfQqeC{g$Oy0&~I@coDG>h3S&F>A2<wT^God4PG#)
z5&(BK(A2>1CA-9pNzc?DWj7jd*7g$>-#mZe1tdVqdXgYl2#`Q1L=zG@Q4VruRK#4k
z<<YF1rsqMUGk5}&C?zFDp7o^?G~bnDOrZNjYXK}43pd`A51~k&KNDy33bAQv6oWg}
zCX62w!uN+3#PF5&_XZwt3Y^c(@|r9)QkSN3qPy08pt4Zxx?hixQjJ%!&1Qr7V;<Ju
zb}>;Awaqd#&BJlA)(FjPn_sv6zN87*XmDe4mKm+3zc^or`v=ya`@r{tNLpe9qGuR+
z_UUA#a&^9VgsT}*=v0OA+R>@Q(0I&-OLi5G+ugzU!0x<4p5@q+S#W)O<Ry}Or=Bfc
zJXr&E+J2Olm9lCAza00e8!!=2k4r?-#%jbh*YuwNC9uqT%u0xa2+vIkm$cjYkqC5j
zbl{q~iJz6Lb$lgYv2R7@2!y<;4!#NL91vDp%XTujZ$kPeN+WD$P*W93N=lHElf#Pl
ztcqkpN7A2z`XT5sq-4G%vM-uIswvjl^vKN2MA7E1qn5(@;1*x$XiiE>VsHuq72yw@
zzV-RT5JZF{<#soY78fHSvds(Xt2$U<L99;#UI{&1c^V$?`-xQx#l5NRw&Bl1zX*r~
zJzW_H@PHifr{G`T4ak9i1@+xOL}18)L3iLccr=$VQSdK10000EWmrjOO-%qQ00008
Z000000002eQ<DGy002ovPDHLkV1i&J(Te~8

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 f9e3aef18c..15e15c4208 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. Grilled-cheese created by AdipemDragon, take from tgstation at commit https://github.com/tgstation/tgstation/commit/716c6db05ab9df28fee81ceb7cf2b6c25f21176d.",
+    "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. Grilled-cheese-cotton modified from grilled-cheese by MadeOfHeartAndStone on Discord.",
     "size": {
         "x": 32,
         "y": 32
@@ -177,6 +177,9 @@
         },
         {
             "name": "grilled-cheese"
+        },
+        {
+            "name": "grilled-cheese-cotton"
         }
     ]
 }