Commit 2

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

@@ -2,23 +2,117 @@
 	name = "oven"
 	desc = "Cookies are ready, dear."
 	icon = 'icons/obj/cooking_machines.dmi'
-	icon_state = "oven_off"
-	on_icon = "oven_on"
-	off_icon = "oven_off"
+	icon_state = "ovenopen"
 	cook_type = "baked"
-	cook_time = 300
+	appliancetype = OVEN
 	food_color = "#A34719"
 	can_burn_food = 1
 	cooked_sound = 'sound/machines/ding.ogg'
+	active_power_usage = 6 KILOWATTS
+	//Based on a double deck electric convection oven
+
+	resistance = 16000
+	idle_power_usage = 2 KILOWATTS
+	//uses ~30% power to stay warm
+	optimal_power = 0.2
+
+	light_x = 2
+	max_contents = 5
+	container_type = /obj/item/weapon/reagent_containers/cooking_container/oven
+
+	stat = POWEROFF	//Starts turned off
+
+	var/open = TRUE
 
 	output_options = list(
-		"Personal Pizza" = /obj/item/weapon/reagent_containers/food/snacks/variable/pizza,
+		"Pizza" = /obj/item/weapon/reagent_containers/food/snacks/variable/pizza,
 		"Bread" = /obj/item/weapon/reagent_containers/food/snacks/variable/bread,
 		"Pie" = /obj/item/weapon/reagent_containers/food/snacks/variable/pie,
-		"Small Cake" = /obj/item/weapon/reagent_containers/food/snacks/variable/cake,
+		"Cake" = /obj/item/weapon/reagent_containers/food/snacks/variable/cake,
 		"Hot Pocket" = /obj/item/weapon/reagent_containers/food/snacks/variable/pocket,
 		"Kebab" = /obj/item/weapon/reagent_containers/food/snacks/variable/kebab,
 		"Waffles" = /obj/item/weapon/reagent_containers/food/snacks/variable/waffles,
 		"Cookie" = /obj/item/weapon/reagent_containers/food/snacks/variable/cookie,
 		"Donut" = /obj/item/weapon/reagent_containers/food/snacks/variable/donut,
-		)
+		)
+
+/obj/machinery/appliance/cooker/oven/update_icon()
+	if(!open)
+		if(!stat)
+			icon_state = "ovenclosed_on"
+		else
+			icon_state = "ovenclosed_off"
+	else
+		icon_state = "ovenopen"
+	..()
+
+/obj/machinery/appliance/cooker/oven/AltClick(var/mob/user)
+	try_toggle_door(user)
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+
+/obj/machinery/appliance/cooker/oven/verb/toggle_door()
+	set src in oview(1)
+	set category = "Object"
+	set name = "Open/close oven door"
+
+	try_toggle_door(usr)
+
+/obj/machinery/appliance/cooker/oven/proc/try_toggle_door(mob/user)
+	if(!isliving(usr) || isAI(user))
+		return
+
+	if(!usr.IsAdvancedToolUser())
+		to_chat(user, "<span class='notice'>You lack the dexterity to do that.</span>")
+		return
+
+	if(!Adjacent(usr))
+		to_chat(user, "<span class='notice'>You can't reach the [src] from there, get closer!</span>")
+		return
+
+	if(open)
+		open = FALSE
+		loss = (active_power_usage / resistance)*0.5
+	else
+		open = TRUE
+		loss = (active_power_usage / resistance)*4
+		//When the oven door is opened, heat is lost MUCH faster
+
+	playsound(src, 'sound/machines/hatch_open.ogg', 20, 1)
+	update_icon()
+
+/obj/machinery/appliance/cooker/oven/can_insert(var/obj/item/I, var/mob/user)
+	if(!open)
+		to_chat(user, "<span class='warning'>You can't put anything in while the door is closed!</span>")
+		return 0
+
+	else
+		return ..()
+
+
+//If an oven's door is open it will lose heat every proc, even if it also gained it
+//But dont call equalize twice in one stack. A return value of -1 from the parent indicates equalize was already called
+/obj/machinery/appliance/cooker/oven/heat_up()
+	.=..()
+	if(open && . != -1)
+		var/turf/T = get_turf(src)
+		if(temperature > T.temperature)
+			equalize_temperature()
+
+/obj/machinery/appliance/cooker/oven/can_remove_items(var/mob/user)
+	if(!open)
+		to_chat(user, "<span class='warning'>You can't take anything out while the door is closed!</span>")
+		return 0
+
+	else
+		return ..()
+
+
+//Oven has lots of recipes and combine options. The chance for interference is high, so
+//If a combine target is set the oven will do it instead of checking recipes
+/obj/machinery/appliance/cooker/oven/finish_cooking(var/datum/cooking_item/CI)
+	if(CI.combine_target)
+		CI.result_type = 3//Combination type. We're making something out of our ingredients
+		combination_cook(CI)
+		return
+	else
+		..()