diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index fa9815ffbe..e005d71330 100644 --- a/code/modules/food/food/condiment.dm +++ b/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 diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm index 665bb08c4d..d67c0819c3 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker.dm +++ b/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 diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 9368e1634e..4fc015668f 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -26,7 +26,7 @@ var/string = "It contains....
" for (var/atom/movable/A in contents) string += "[A.name]
" - . += "string" + . += "[string]" if (reagents.total_volume) . += "It contains [reagents.total_volume]u of reagents." @@ -41,7 +41,7 @@ if(!user.unEquip(I)) return I.forceMove(src) - to_chat(user, "You put the [I] into the [src]") + to_chat(user, "You put the [I] into the [src].") return /obj/item/weapon/reagent_containers/cooking_container/verb/empty() diff --git a/code/modules/food/kitchen/cooking_machines/grill.dm b/code/modules/food/kitchen/cooking_machines/grill.dm index e0ae43f3fe..19bccda35b 100644 --- a/code/modules/food/kitchen/cooking_machines/grill.dm +++ b/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() diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 49fb11f7c6..5fd6fa34b7 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/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) diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm index 4c709173fe..2686837a71 100644 --- a/code/modules/food/recipe.dm +++ b/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