From 7b52e4793cfbe5915104f73f217eaa756f4ecde7 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:55:35 +0100
Subject: [PATCH] [MIRROR] Grilled cheese sandwiches are now actually grilled,
 and made on the griddle. (#4242)

* Grilled cheese sandwiches are now actually grilled, and made on the griddle. (#57743)

Removes the toasted sandwich. There is now a cheese sandwich, and a grilled cheese sandwich. The cheese sandwich is made through the crafting menu under sandwiches from two slices of cheese and two slices of bread. The grilled cheese sandwich is made by putting a cheese sandwich on the griddle in the same way that you would make a steak.

* Grilled cheese sandwiches are now actually grilled, and made on the griddle.

Co-authored-by: Sylphet <58074918+Sylphet@users.noreply.github.com>
---
 _maps/shuttles/emergency_luxury.dmm           |  2 +-
 code/game/objects/items/food/sandwichtoast.dm | 21 +++++++++++--------
 .../recipes/tablecraft/recipes_sandwich.dm    |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index 2a2bcfed251..95c5c36a378 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -299,7 +299,7 @@
 /turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "aX" = (
-/obj/item/food/grilledcheese{
+/obj/item/food/grilled_cheese_sandwich{
 	pixel_y = 11
 	},
 /obj/structure/table/wood/fancy/black,
diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm
index 02aba16ffc2..64172edae10 100644
--- a/code/game/objects/items/food/sandwichtoast.dm
+++ b/code/game/objects/items/food/sandwichtoast.dm
@@ -5,33 +5,36 @@
 	icon_state = "sandwich"
 	trash_type = /obj/item/trash/plate
 	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 1)
-	microwaved_type = /obj/item/food/toastedsandwich
 	tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
 	foodtypes = GRAIN | VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
 
-/obj/item/food/toastedsandwich
-	name = "toasted sandwich"
-	desc = "Now if you only had a pepper bar."
+/obj/item/food/grilled_cheese_sandwich
+	name = "grilled cheese sandwich"
+	desc = "A warm, melty sandwich that goes perfectly with tomato soup."
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "toastedsandwich"
 	trash_type = /obj/item/trash/plate
 	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/carbon = 4)
-	tastes = list("toast" = 1)
+	tastes = list("toast" = 2, "cheese" = 3, "butter" = 1)
 	foodtypes = GRAIN
 	w_class = WEIGHT_CLASS_SMALL
+	burns_on_grill = TRUE
 
-/obj/item/food/grilledcheese
+/obj/item/food/cheese_sandwich
 	name = "cheese sandwich"
-	desc = "Goes great with Tomato soup!"
+	desc = "A light snack for a warm day. ...but what if you grilled it?"
 	icon = 'icons/obj/food/burgerbread.dmi'
-	icon_state = "toastedsandwich"
+	icon_state = "sandwich"
 	trash_type = /obj/item/trash/plate
 	food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
-	tastes = list("toast" = 1, "cheese" = 1)
+	tastes = list("bread" = 1, "cheese" = 1)
 	foodtypes = GRAIN | DAIRY
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/food/cheese_sandwich/MakeGrillable()
+	AddComponent(/datum/component/grillable, /obj/item/food/grilled_cheese_sandwich, rand(30 SECONDS, 60 SECONDS), TRUE)
+
 /obj/item/food/jellysandwich
 	name = "jelly sandwich"
 	desc = "You wish you had some peanut butter to go with this..."
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index c88c6ca1ad3..c60fbd3e8eb 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -16,13 +16,13 @@
 	result = /obj/item/food/sandwich
 	subcategory = CAT_SANDWICH
 
-/datum/crafting_recipe/food/grilledcheesesandwich
+/datum/crafting_recipe/food/cheese_sandwich
 	name = "Cheese sandwich"
 	reqs = list(
 		/obj/item/food/breadslice/plain = 2,
 		/obj/item/food/cheese = 2
 	)
-	result = /obj/item/food/grilledcheese
+	result = /obj/item/food/cheese_sandwich
 	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/food/slimesandwich