From 2c409ca75422cd3f25a33c6e2026d2f003fee790 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Thu, 27 May 2021 20:00:04 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../food/kitchen/cooking_machines/candy.dm    | 92 -------------------
 1 file changed, 92 deletions(-)

diff --git a/code/modules/food/kitchen/cooking_machines/candy.dm b/code/modules/food/kitchen/cooking_machines/candy.dm
index 22d25cbc03..92806dc9a4 100644
--- a/code/modules/food/kitchen/cooking_machines/candy.dm
+++ b/code/modules/food/kitchen/cooking_machines/candy.dm
@@ -1,94 +1,3 @@
-<<<<<<< HEAD
-/obj/machinery/appliance/mixer/candy
-	name = "candy machine"
-	desc = "Get yer candied cheese wheels here!"
-	icon_state = "mixer_off"
-	off_icon = "mixer_off"
-	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
-
-	output_options = list(
-		"Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker,
-		"Candy Bar" = /obj/item/weapon/reagent_containers/food/snacks/variable/candybar,
-		"Sucker" = /obj/item/weapon/reagent_containers/food/snacks/variable/sucker,
-		"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)
-	. = ..()
-||||||| parent of da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085
-/obj/machinery/appliance/mixer/candy
-	name = "candy machine"
-	desc = "Get yer candied cheese wheels here!"
-	icon_state = "mixer_off"
-	off_icon = "mixer_off"
-	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
-
-	output_options = list(
-		"Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker,
-		"Candy Bar" = /obj/item/weapon/reagent_containers/food/snacks/variable/candybar,
-		"Sucker" = /obj/item/weapon/reagent_containers/food/snacks/variable/sucker,
-		"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)
-	. = ..()
-=======
 /obj/machinery/appliance/mixer/candy
 	name = "candy machine"
 	desc = "Get yer candied cheese wheels here!"
@@ -133,4 +42,3 @@
 /obj/machinery/appliance/mixer/candy/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/product)
 	food_color = get_random_colour(1)
 	. = ..()
->>>>>>> da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085