Various fixes and bugfixes from live playtests

code/modules/food/food/condiment.dm

@@ -433,6 +433,7 @@
 /obj/item/weapon/reagent_containers/food/condiment/spacespice
 	name = "space spices"
 	desc = "An exotic blend of spices for cooking. Definitely not worms."
+	icon = 'icons/obj/food_syn.dmi'
 	icon_state = "spacespicebottle"
 	possible_transfer_amounts = list(1,40) //for clown turning the lid off
 	amount_per_transfer_from_this = 1

code/modules/food/kitchen/cooking_machines/_cooker.dm

@@ -5,7 +5,7 @@
 	var/optimal_power = 0.1//cooking power at 100%
 
 	var/loss = 1	//Temp lost per proc when equalising
-	var/resistance = 320000	//Resistance to heating. combines with active power usage to determine how long heating takes
+	var/resistance = 32000	//Resistance to heating. combines with active power usage to determine how long heating takes. 32k by default.
 
 	var/light_x = 0
 	var/light_y = 0

code/modules/food/kitchen/cooking_machines/container.dm

@@ -26,7 +26,7 @@
 		var/string = "It contains....</br>"
 		for (var/atom/movable/A in contents)
 			string += "[A.name] </br>"
-		. += "<span class='notice'>string</span>"
+		. += "<span class='notice'>[string]</span>"
 	if (reagents.total_volume)
 		. += "<span class='notice'>It contains [reagents.total_volume]u of reagents.</span>"
 
@@ -41,7 +41,7 @@
 			if(!user.unEquip(I))
 				return
 			I.forceMove(src)
-			to_chat(user, "<span class='notice'>You put the [I] into the [src]</span>")
+			to_chat(user, "<span class='notice'>You put the [I] into the [src].</span>")
 			return
 
 /obj/item/weapon/reagent_containers/cooking_container/verb/empty()

code/modules/food/kitchen/cooking_machines/grill.dm

@@ -9,6 +9,16 @@
 	can_burn_food = 1
 	stat = POWEROFF
 	
+	appliancetype = GRILL
+
+	active_power_usage = 4 KILOWATTS
+	idle_power_usage = 2 KILOWATTS
+
+	// Grill is faster to heat and setup than the rest.
+	optimal_temp = 120 + T0C
+	min_temp = 60 + T0C
+	resistance = 8 KILOWATTS // Very fast to heat up.
+	
 	container_type = /obj/item/weapon/reagent_containers/cooking_container/grill
 
 /obj/machinery/appliance/grill/toggle_power()

code/modules/food/kitchen/microwave.dm

@@ -323,7 +323,6 @@
 		recipe.after_cook(src)
 		recipe = select_recipe(available_recipes,src)
 		if(recipe && recipe.result == result)
-			to_chat(world, "multicook [recipe] [recipe?.result], our contents are [json_encode(contents)]")
 			valid = 1
 			sleep(2)
 

code/modules/food/recipe.dm

@@ -30,12 +30,13 @@
  *
  * */
  
-// Recipe type defines. Used to determine what machine makes them. TODO: Add Grill to the list.
+// Recipe type defines. Used to determine what machine makes them.
 #define MICROWAVE			0x1
 #define FRYER				0x2
 #define OVEN				0x4
-#define CANDYMAKER			0x8
-#define CEREALMAKER			0x10
+#define GRILL				0x8
+#define CANDYMAKER			0x10
+#define CEREALMAKER			0x20
 
 /datum/recipe
 	var/list/reagents		// Example: = list("berryjuice" = 5) // do not list same reagent twice