Rebase onto Master for Volume Control Panel, Squash Commits

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

@@ -13,6 +13,7 @@ fundamental differences
 	cooking_coeff = 0.75 // Original value 0.4
 	active_power_usage = 3000
 	idle_power_usage = 50
+	var/datum/looping_sound/mixer/mixer_loop
 
 /obj/machinery/appliance/mixer/examine(var/mob/user)
 	. = ..()
@@ -24,6 +25,13 @@ fundamental differences
 	cooking_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src))
 	cooking = FALSE
 	selected_option = pick(output_options)
+	
+	mixer_loop = new(list(src), FALSE)
+	
+/obj/machinery/appliance/mixer/Destroy()
+	. = ..()
+	
+	QDEL_NULL(mixer_loop)
 
 //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()
@@ -132,8 +140,12 @@ fundamental differences
 /obj/machinery/appliance/mixer/update_icon()
 	if (!stat)
 		icon_state = on_icon
+		if(mixer_loop)
+			mixer_loop.start(src)
 	else
 		icon_state = off_icon
+		if(mixer_loop)
+			mixer_loop.stop(src)
 
 
 /obj/machinery/appliance/mixer/process()

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

@@ -6,6 +6,7 @@
 	on_icon = "mixer_on"
 	cook_type = "candied"
 	appliancetype = CANDYMAKER
+	var/datum/looping_sound/candymaker/candymaker_loop
 	circuit = /obj/item/weapon/circuitboard/candymachine
 	cooking_coeff = 1.0 // Original Value 0.6
 
@@ -16,6 +17,28 @@
 		"Jelly" = /obj/item/weapon/reagent_containers/food/snacks/variable/jelly
 		)
 
+/obj/machinery/appliance/mixer/candy/Initialize()
+	. = ..()
+	
+	candymaker_loop = new(list(src), FALSE)
+	
+/obj/machinery/appliance/mixer/candy/Destroy()
+	. = ..()
+	
+	QDEL_NULL(candymaker_loop)
+
+/obj/machinery/appliance/mixer/candy/update_icon()
+	. = ..()
+
+	if(!stat)
+		icon_state = on_icon
+		if(candymaker_loop)
+			candymaker_loop.start(src)
+	else
+		icon_state = off_icon
+		if(candymaker_loop)
+			candymaker_loop.stop(src)
+
 /obj/machinery/appliance/mixer/candy/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/cooked/product)
 	food_color = get_random_colour(1)
 	. = ..()

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

@@ -7,12 +7,23 @@
 	on_icon = "cereal_on"
 	off_icon = "cereal_off"
 	appliancetype = CEREALMAKER
+	var/datum/looping_sound/cerealmaker/cerealmaker_loop
 	circuit = /obj/item/weapon/circuitboard/cerealmaker
 
 	output_options = list(
 		"Cereal" = /obj/item/weapon/reagent_containers/food/snacks/variable/cereal
 	)
+
+/obj/machinery/appliance/mixer/cereal/Initialize()
+	. = ..()
 	
+	cerealmaker_loop = new(list(src), FALSE)
+	
+/obj/machinery/appliance/mixer/cereal/Destroy()
+	. = ..()
+	
+	QDEL_NULL(cerealmaker_loop)
+
 /*
 /obj/machinery/appliance/mixer/cereal/change_product_strings(var/obj/item/weapon/reagent_containers/food/snacks/product, var/datum/cooking_item/CI)
 	. = ..()
@@ -31,6 +42,18 @@
 	product.overlays += food_image
 */
 
+/obj/machinery/appliance/mixer/cereal/update_icon()
+	. = ..()
+
+	if(!stat)
+		icon_state = on_icon
+		if(cerealmaker_loop)
+			cerealmaker_loop.start(src)
+	else
+		icon_state = off_icon
+		if(cerealmaker_loop)
+			cerealmaker_loop.stop(src)
+
 /obj/machinery/appliance/mixer/cereal/combination_cook(var/datum/cooking_item/CI)
 
 	var/list/images = list()

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

@@ -8,6 +8,7 @@
 	on_icon = "grill_on"
 	off_icon = "grill_off"
 	can_burn_food = TRUE
+	var/datum/looping_sound/grill/grill_loop
 	circuit = /obj/item/weapon/circuitboard/grill
 	active_power_usage = 4 KILOWATTS
 	heating_power = 4000
@@ -24,6 +25,28 @@
 	
 	max_contents = 3 // Arbitrary number, 3 grill 'racks'
 	container_type = /obj/item/weapon/reagent_containers/cooking_container/grill
+	
+/obj/machinery/appliance/cooker/grill/Initialize()
+	. = ..()
+	grill_loop = new(list(src), FALSE)
+	
+/obj/machinery/appliance/cooker/grill/Destroy()
+	QDEL_NULL(grill_loop)
+	return ..()
+	
+/obj/machinery/appliance/cooker/grill/update_icon() // TODO: Cooking icon
+	if(!stat)
+		icon_state = on_icon
+		if(cooking == TRUE)
+			if(grill_loop)
+				grill_loop.start(src)
+		else
+			if(grill_loop)
+				grill_loop.stop(src)
+	else
+		icon_state = off_icon
+		if(grill_loop)
+			grill_loop.stop(src)
 
 /* // Test Comment this out too, /cooker does this for us, and this path '/obj/machinery/appliance/grill' is invalid anyways, meaning it does jack shit. - Updated the paths, but I'm basically commenting all this shit out and if the grill works as-normal, none of this stuff is needed.
 /obj/machinery/appliance/grill/toggle_power()
@@ -88,12 +111,6 @@
 	return 0
 */
 
-/obj/machinery/appliance/grill/update_icon() // TODO: Cooking icon
-	if(!stat)
-		icon_state = on_icon
-	else
-		icon_state = off_icon
-
 /* // Test remove this too.
 /obj/machinery/appliance/grill/process()
 	if (!stat)

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

@@ -7,6 +7,7 @@
 	appliancetype = OVEN
 	food_color = "#A34719"
 	can_burn_food = TRUE
+	var/datum/looping_sound/oven/oven_loop
 	circuit = /obj/item/weapon/circuitboard/oven
 	active_power_usage = 6 KILOWATTS
 	heating_power = 6 KILOWATTS
@@ -37,6 +38,15 @@
 		"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/Initialize()
+	. = ..()
+	
+	oven_loop = new(list(src), FALSE)
+	
+/obj/machinery/appliance/cooker/oven/Destroy()
+	QDEL_NULL(oven_loop)
+	return ..()
 
 /obj/machinery/appliance/cooker/oven/update_icon()
 	if(!open)
@@ -44,12 +54,20 @@
 			icon_state = "ovenclosed_on"
 			if(cooking == TRUE)
 				icon_state = "ovenclosed_cooking"
+				if(oven_loop)
+					oven_loop.start(src)
 			else
 				icon_state = "ovenclosed_on"
+				if(oven_loop)
+					oven_loop.stop(src)
 		else
 			icon_state = "ovenclosed_off"
+			if(oven_loop)
+				oven_loop.stop(src)
 	else
 		icon_state = "ovenopen"
+		if(oven_loop)
+			oven_loop.stop(src)
 	..()
 
 /obj/machinery/appliance/cooker/oven/AltClick(var/mob/user)