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>

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 052886eadff613be2a1b82088242a3d11250c415..88506d33a62af1563f85c72af95b591496bfea06 100644 (file)
--- 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 e6882fa621195273458e7a0a6e2906e85b164fe7..c7a10d42120a110313427b3d3e073e04aaf9bdcd 100644 (file)
--- 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 60c7d74c0d97d8452e720aa8749794217ce12d64..589d98e34b401e55ccfa4a3e28d6ef0a91fe24fa 100644 (file)
--- 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 (file)
index 0000000..8295ed1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/grilled-cheese-cotton.png differ

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 f9e3aef18c2a68dde8c352c7a85341810d87addc..15e15c4208a88c72d653e78498657f56a87836a5 100644 (file)
--- 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"
         }
     ]
 }