Heating up reagents in food when cooking

__DEFINES/setup.dm

@@ -1832,14 +1832,17 @@ var/list/weekend_days = list("Friday", "Saturday", "Sunday")
 #define MUZZLE_SOFT 1	//Muzzle causes muffled speech.
 #define MUZZLE_HARD	2	//Muzzle prevents speech.
 
-//Microwave-or-pan selective cookability of recipes
+//Cooking vessel-selective cookability of recipes
 #define COOKABLE_WITH_MICROWAVE (1<<0)
 #define COOKABLE_WITH_PAN (1<<1)
+#define COOKABLE_WITH_MIXING (1<<2) //For things like salads and ice cream that don't require heat to cook (when mixing bowls are implemented, for now this is just used to not heat those recipes when they're made in a microwave).
+#define COOKABLE_WITH_HEAT (COOKABLE_WITH_MICROWAVE | COOKABLE_WITH_PAN)
 #define COOKABLE_WITH_ALL ALL
 
 //Flags for the contents of a cooking vessel
 #define COOKVESSEL_CONTAINS_REAGENTS (1<<0) //The cooking vessel contains reagents
 #define COOKVESSEL_CONTAINS_CONTENTS (1<<1)	//The cooking vessel contains non-reagent contents (eg. items)
 
-//Default cooking temperature
-#define COOKTEMP_DEFAULT T0C + 316 //Around 600 F
+//Cooking-related temperatures
+#define COOKTEMP_DEFAULT (T0C + 316) //Default cooking temperature, around 600 F
+#define COOKTEMP_HUMANSAFE 355 //Human-safe temperature for cooked food, 5 degrees less than the threshold for burning a human.

code/datums/recipe.dm

@@ -39,7 +39,7 @@
 	var/result //Result of a complete recipe. result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
 	var/time = 10 SECONDS //Length of time it takes to complete the recipe. In 10ths of a second
 	var/priority = 0 //To check which recipe takes priority if they share ingredients
-	var/cookable_with = COOKABLE_WITH_ALL //How this recipe can be cooked, eg. COOKABLE_WITH_MICROWAVE (see setup.dm).
+	var/cookable_with = COOKABLE_WITH_HEAT //How this recipe can be cooked, eg. COOKABLE_WITH_MICROWAVE (see setup.dm).
 
 /*
 	check_reagents function

code/game/machinery/kitchen/microwave.dm

@@ -7,7 +7,7 @@
 	anchored = 1
 	use_power = MACHINE_POWER_USE_IDLE
 	idle_power_usage = 5
-	active_power_usage = 100
+	active_power_usage = 500
 	machine_flags = SCREWTOGGLE | CROWDESTROY | WRENCHMOVE | EJECTNOTDEL | EMAGGABLE
 	flags = OPENCONTAINER | NOREACT
 	pass_flags = PASSTABLE
@@ -64,7 +64,7 @@
 	create_reagents(100)
 
 	if (!available_recipes)
-		available_recipes = generate_available_recipes(flags = COOKABLE_WITH_MICROWAVE)
+		available_recipes = generate_available_recipes(flags = COOKABLE_WITH_MICROWAVE | COOKABLE_WITH_MIXING) //Allow things like salads to be made in a microwave while mixing bowls are unimplemented.
 		acceptable_reagents = new
 		for (var/datum/recipe/recipe in available_recipes)
 			for (var/item in recipe.items)
@@ -406,9 +406,30 @@
 			cooked = fail()
 		stop()
 		if(cooked)
+			adjust_cooked_food_reagents_temperature(cooked, recipe)
 			cooked.forceMove(src.loc)
 		return
 
+/obj/machinery/microwave/proc/adjust_cooked_food_reagents_temperature(atom/cooked, datum/recipe/cookedrecipe)
+	//Put the energy used during the cooking into heating the reagents of the food.
+
+	var/cooktime = 10 SECONDS //Use a default to account for burned messes, etc.
+
+	if(cookedrecipe)
+		cooktime = cookedrecipe.time
+		//If we cooked something like ice cream or salad, abort to avoid hot ice cream.
+		if(cookedrecipe.cookable_with == COOKABLE_WITH_MIXING)
+			if(!istype(cooked, /obj/item/weapon/reagent_containers/food/snacks/badrecipe)) //Continue and heat up burned messes for valid, salad-like recipes in the case of emagged, etc.
+				return
+
+	if(cooked.reagents.total_volume > 0)
+		var/thermal_energy_transfer = cooktime * active_power_usage * 0.9 / (1 SECONDS) //Let's assume 90% efficiency. One area for expansion could be to have this depend on upgrades.
+		var/max_temperature = COOKTEMP_HUMANSAFE
+		if(emagged || arcanetampered)
+			max_temperature = INFINITY //If it's been messed with, let it heat more than that.
+		if(cooked.reagents.chem_temp < max_temperature)
+			cooked.reagents.heating(thermal_energy_transfer, max_temperature)
+
 /obj/machinery/microwave/proc/running(var/seconds as num) // was called wzhzhzh, for some fucking reason
 	for (var/i=1 to seconds)
 		if (stat & (NOPOWER|BROKEN|FORCEDISABLE))
@@ -420,7 +441,7 @@
 /obj/machinery/microwave/proc/has_extra_item()
 	for (var/obj/O in contents)
 		if ( \
-				!istype(O,/obj/item/weapon/reagent_containers/food) && \
+				!istype(O, /obj/item/weapon/reagent_containers/food) && \
 				!istype(O, /obj/item/weapon/grown) \
 			)
 			return 1

code/game/objects/items/weapons/pan.dm

@@ -360,6 +360,10 @@
 	if(!(O?.can_cook())) //if eg. the power went out on the grill, don't cook
 		return
 
+	//If there are any reagents in the pan, heat them.
+	if(reagents.total_volume)
+		reagents.heating(O.cook_energy(), O.cook_temperature())
+
 	cookingprogress += (SS_WAIT_FAST_OBJECTS * speed_multiplier)
 
 	if(cookingprogress >= (currentrecipe ? currentrecipe.time : 10 SECONDS) && !burned) //it's done when it's cooked for the cooking time, or a default of 10 seconds if there's no valid recipe. also if it's already been burned, don't keep looping burned mess -> burned mess.
@@ -373,7 +377,7 @@
 			cooked = currentrecipe.make_food(src, chef)
 			visible_message("<span class='notice'>[cooked] looks done.</span>")
 			playsound(src, 'sound/effects/frying.ogg', 50, 1)
-		else if(contains_anything & COOKVESSEL_CONTAINS_CONTENTS) //Don't make a burned mess out of just reagents, even though recipes can call for only reagents (spaghetti). Just keep heating the reagents.
+		else if(contains_anything & COOKVESSEL_CONTAINS_CONTENTS) //Don't make a burned mess out of just reagents, even though recipes can call for only reagents (spaghetti). This allows using the pan to heat reagents.
 			cooked = cook_fail()
 
 		if(cooked)
@@ -385,10 +389,6 @@
 			//re-check the recipe. generally this will return null because we'll continue cooking the previous result, which will lead to a burned mess
 			currentrecipe = select_recipe(available_recipes, src)
 
-	//If there are any reagents in the pan, heat them.
-	if(reagents.total_volume)
-		reagents.heating(500, O ? O.cook_temperature() : COOKTEMP_DEFAULT) //Thermal transfer is half that of fire_act. Could be generalized based on the conditions of the cooktop. For example, like how bunsen burners work.
-
 	//Hotspot expose
 	var/turf/T = get_turf(src)
 	T?.hotspot_expose(O ? O.cook_temperature() : COOKTEMP_DEFAULT, 500, 1, surfaces = 0) //Everything but the first arg is taken from igniter.

code/game/objects/objs.dm

@@ -87,6 +87,9 @@ var/global/list/reagents_to_log = list(FUEL, PLASMA, PACID, SACID, AMUTATIONTOXI
 /obj/proc/cook_temperature() //Returns the temperature the object cooks at.
 	return COOKTEMP_DEFAULT
 
+/obj/proc/cook_energy() //Returns the energy transferred to the reagents in the cooking vessel per process() tick of the cooking vessel. Cooking vessels use the fast objects subsystem.
+	return 500 //Half that of fire_act().
+
 /obj/proc/generate_available_recipes(flags = COOKABLE_WITH_ALL)
 	var/list/recipes = list()
 	for(var/type in (typesof(/datum/recipe) - /datum/recipe))

code/modules/food/cooking_machines.dm

@@ -126,7 +126,7 @@ var/global/ingredientLimit = 10
 	else
 		icon_state = initial(icon_state)
 
-/////////////////////Cooking stuff/////////////////////
+/////////////////////Cooking vessel stuff/////////////////////
 /obj/machinery/cooking/can_cook() //Whether or not we are in a valid state to cook the contents of a cooking vessel.
 	. = ..()
 	if(stat & (FORCEDISABLE | NOPOWER | BROKEN))
@@ -151,6 +151,9 @@ var/global/ingredientLimit = 10
 	overlays.len = 0
 	..()
 
+/obj/machinery/cooking/cook_energy()
+	return active_power_usage * SS_WAIT_FAST_OBJECTS * 0.9 / (1 SECONDS) //Assumes 90% efficiency. Could be expanded to depend on upgrades.
+
 // Interactions ////////////////////////////////////////////////
 
 /obj/machinery/cooking/examine(mob/user)
@@ -460,10 +463,20 @@ var/global/ingredientLimit = 10
 	cks_max_volume = 400
 	cooks_in_reagents = 1
 	var/fry_reagent = CORNOIL
+	var/fry_reagent_temp = T0C + 170 //target temperature of the frying reagent
 
 /obj/machinery/cooking/deepfryer/initialize()
 	..()
 	reagents.add_reagent(fry_reagent, 300)
+	if(stat & (FORCEDISABLE | NOPOWER | BROKEN))
+		reagents.add_reagent(fry_reagent, 300)
+	else
+		reagents.add_reagent(fry_reagent, 300, reagtemp = fry_reagent_temp)
+
+/obj/machinery/cooking/deepfryer/process()
+	if(stat & (FORCEDISABLE | NOPOWER | BROKEN))
+		return
+	reagents.heating(active_power_usage * 0.9 * SS_WAIT_MACHINERY / (1 SECONDS), fry_reagent_temp) //Assume 90% efficiency. This could be expanded to depend on upgrades.
 
 /obj/machinery/cooking/deepfryer/proc/empty_icon() //sees if the value is empty, and changes the icon if it is
 	reagents.update_total() //make the values refresh
@@ -503,6 +516,8 @@ var/global/ingredientLimit = 10
 	if(istype(ingredient,/obj/item/weapon/reagent_containers/food/snacks))
 		if(cooks_in_reagents)
 			transfer_reagents_to_food(ingredient)
+			if(ingredient.reagents.chem_temp > COOKTEMP_HUMANSAFE) //Since gradual cooling isn't implemented, make sure the food isn't scalding hot.
+				ingredient.reagents.chem_temp = COOKTEMP_HUMANSAFE
 		ingredient.name = "deep fried [ingredient.name]"
 		ingredient.color = "#FFAD33"
 		ingredient.forceMove(loc)
@@ -512,6 +527,8 @@ var/global/ingredientLimit = 10
 		var/obj/item/weapon/reagent_containers/food/snacks/deepfryholder/D = new(loc)
 		if(cooks_in_reagents)
 			transfer_reagents_to_food(D)
+			if(D.reagents.chem_temp > COOKTEMP_HUMANSAFE) //Same as above.
+				D.reagents.chem_temp = COOKTEMP_HUMANSAFE
 		D.name = "deep fried [ingredient.name]"
 		D.color = "#FFAD33"
 		D.icon = ingredient.icon
@@ -549,7 +566,6 @@ var/global/ingredientLimit = 10
 	takeIngredient(I, L, TRUE) //shove the item in, even if it can't be deepfried normally
 	empty_icon()
 
-
 // confectionator ///////////////////////////////////////
 // its like a deepfrier
 
@@ -706,6 +722,11 @@ var/global/ingredientLimit = 10
 	ingredient = null
 	return
 
+/obj/machinery/cooking/grill/process()
+	if(ingredient)
+		if(ingredient.reagents.total_volume > 0)
+			ingredient.reagents.heating(active_power_usage * 0.9 * SS_WAIT_MACHINERY / (1 SECONDS), COOKTEMP_HUMANSAFE) //Assume 90% efficiency. Could be expanded to depend on upgrades.
+
 /obj/machinery/cooking/grill/spit
 	name = "spit"
 	desc = "the prime in clown cooking technology."
@@ -750,7 +771,6 @@ var/global/ingredientLimit = 10
 		if(!campfirefound)
 			. = "There's no campfire to cook on!"
 
-
 //=====Actual fucking sensible cooking machines that don't magic bullshit out of thin air
 
 /obj/machinery/oven
@@ -849,7 +869,8 @@ var/global/ingredientLimit = 10
 	if(use_power == MACHINE_POWER_USE_NONE)
 		toggle()
 	if(within)
-		within.attempt_heating(src)
+		if(within.reagents.total_volume > 0)
+			within.reagents.heating(active_power_usage * 0.9 * SS_WAIT_MACHINERY / (1 SECONDS), COOKTEMP_HUMANSAFE) //Assume 90% efficiency. One area of exapansion could be to make this depend on upgrades.
 
 /obj/machinery/cooking/foodpress
 	name = "food press"