Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

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

@@ -53,12 +53,10 @@
 	if (!available_recipes)
 		available_recipes = new
 
-	for (var/type in subtypesof(/datum/recipe))
-		var/datum/recipe/test = new type
-		if ((appliancetype & test.appliance))
-			available_recipes += test
-		else
-			qdel(test)
+	for(var/type in subtypesof(/datum/recipe))
+		var/datum/recipe/test = type
+		if((appliancetype & initial(test.appliance)))
+			available_recipes += new test
 
 /obj/machinery/appliance/Destroy()
 	for (var/a in cooking_objs)
@@ -79,7 +77,7 @@
 		for (var/a in cooking_objs)
 			var/datum/cooking_item/CI = a
 			string += "-\a [CI.container.label(null, CI.combine_target)], [report_progress(CI)]</br>"
-		to_chat(user, string)
+		return string
 	else
 		to_chat(user, "<span class='notice>'It is empty.</span>")
 
@@ -125,14 +123,14 @@
 		return
 
 	if (!user.IsAdvancedToolUser())
-		to_chat(user, "You lack the dexterity to do that!")
+		to_chat(user, "<span class='warning'>You lack the dexterity to do that!</span>")
 		return
 
 	if (user.stat || user.restrained() || user.incapacitated())
 		return
 
 	if (!Adjacent(user) && !issilicon(user))
-		to_chat(user, "You can't reach [src] from here.")
+		to_chat(user, "<span class='warning'>You can't reach [src] from here!</span>")
 		return
 
 	if (stat & POWEROFF)//Its turned off
@@ -234,10 +232,10 @@
 
 //This function is overridden by cookers that do stuff with containers
 /obj/machinery/appliance/proc/has_space(var/obj/item/I)
-	if (cooking_objs.len >= max_contents)
+	if(cooking_objs.len >= max_contents)
 		return FALSE
 
-	else return TRUE
+	return TRUE
 
 /obj/machinery/appliance/attackby(var/obj/item/I, var/mob/user)
 	if(!cook_type || (stat & (BROKEN)))
@@ -246,12 +244,9 @@
 
 	var/result = can_insert(I, user)
 	if(!result)
-		if(default_deconstruction_screwdriver(user, I))
-			return
-		else if(default_part_replacement(user, I))
-			return
-		else
-			return
+		if(!(default_deconstruction_screwdriver(user, I)))
+			default_part_replacement(user, I)
+		return
 
 	if(result == 2)
 		var/obj/item/weapon/grab/G = I
@@ -572,17 +567,17 @@
 			var/datum/cooking_item/CI = menuoptions[selection]
 			eject(CI, user)
 			update_icon()
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
 /obj/machinery/appliance/proc/can_remove_items(var/mob/user)
 	if (!Adjacent(user))
-		return 0
+		return FALSE
 
 	if (isanimal(user))
-		return 0
+		return FALSE
 
-	return 1
+	return TRUE
 
 /obj/machinery/appliance/proc/eject(var/datum/cooking_item/CI, var/mob/user = null)
 	var/obj/item/thing

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

@@ -19,12 +19,12 @@
 	if(.)	//no need to duplicate adjacency check
 		if(!stat)
 			if (temperature < min_temp)
-				to_chat(user, "<span class='warning'>\The [src] is still heating up and is too cold to cook anything yet.</span>")
+				. += "<span class='warning'>\The [src] is still heating up and is too cold to cook anything yet.</span>"
 			else
-				to_chat(user, "<span class='notice'>It is running at [round(get_efficiency(), 0.1)]% efficiency!</span>")
-			to_chat(user, "Temperature: [round(temperature - T0C, 0.1)]C / [round(optimal_temp - T0C, 0.1)]C")
+				. += "<span class='notice'>It is running at [round(get_efficiency(), 0.1)]% efficiency!</span>"
+			. += "Temperature: [round(temperature - T0C, 0.1)]C / [round(optimal_temp - T0C, 0.1)]C"
 		else
-			to_chat(user, "<span class='warning'>It is switched off.</span>")
+			. += "<span class='warning'>It is switched off.</span>"
 			
 /obj/machinery/appliance/cooker/list_contents(var/mob/user)
 	if (cooking_objs.len)

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

@@ -17,7 +17,7 @@ fundamental differences
 /obj/machinery/appliance/mixer/examine(var/mob/user)
 	. = ..()
 	if(Adjacent(user))
-		to_chat(user, "<span class='notice'>It is currently set to make a [selected_option]</span>")
+		. += "<span class='notice'>It is currently set to make a [selected_option]</span>"
 
 /obj/machinery/appliance/mixer/Initialize()
 	. = ..()
@@ -27,7 +27,7 @@ fundamental differences
 
 //Mixers cannot-not do combining mode. So the default option is removed from this. A combine target must be chosen
 /obj/machinery/appliance/mixer/choose_output()
-	set src in oview(1)
+	set src in view(1)
 	set name = "Choose output"
 	set category = "Object"
 
@@ -91,7 +91,7 @@ fundamental differences
 
 
 /obj/machinery/appliance/mixer/toggle_power()
-	set src in view()
+	set src in view(1)
 	set name = "Toggle Power"
 	set category = "Object"
 

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

@@ -14,6 +14,8 @@
 	active_power_usage = 12 KILOWATTS
 	heating_power = 12000
 	
+	light_y = 15
+	
 	min_temp = 140 + T0C	// Same as above, increasing this to just under 2x to make the % increase on efficiency not quite so painful as it would be at 80.
 	optimal_temp = 400 + T0C // Increasing this to be 2x Oven to allow for a much higher/realistic frying temperatures. Doesn't really do anything but make heating the fryer take a bit longer.
 	optimal_power = 0.95 // .35 higher than the default to give fryers faster cooking speed.
@@ -55,6 +57,19 @@
 	if(Adjacent(user))
 		to_chat(user, "Oil Level: [oil.total_volume]/[optimal_oil]")
 		
+/obj/machinery/appliance/cooker/fryer/update_icon() // We add our own version of the proc to use the special fryer double-lights.
+	cut_overlays()
+	var/image/light
+	if(use_power == 1 && !stat)
+		light = image(icon, "fryer_light_idle")
+	else if(use_power == 2 && !stat)
+		light = image(icon, "fryer_light_preheating")
+	else
+		light = image(icon, "fryer_light_off")
+	light.pixel_x = light_x
+	light.pixel_y = light_y
+	add_overlay(light)
+		
 /obj/machinery/appliance/cooker/fryer/heat_up()
 	if (..())
 		//Set temperature of oil reagent

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

@@ -17,7 +17,8 @@
 	//uses ~30% power to stay warm
 	optimal_power = 0.8 // Oven cooks .2 faster than the default speed.
 
-	light_x = 2
+	light_x = 3
+	light_y = 4
 	max_contents = 5
 	container_type = /obj/item/weapon/reagent_containers/cooking_container/oven