From 079b6492fd6924390b9282787fc3a61602a7f0bb Mon Sep 17 00:00:00 2001
From: FalseIncarnate <false_incarnate@yahoo.com>
Date: Wed, 15 Apr 2015 20:12:46 -0400
Subject: [PATCH] Candy Fixes

- Fixes the bad rainbow cotton candy not actually using a "toxin" as
it's reagent contents.
- - Previously contained Lexorin, now contains Sulfonal.

- Fixes the candy maker "eating" candy moulds and causing a runtime
while doing so.
- - Incorrect recipes still destroy the mould, but successful candy
making will return it's mould as intended.
---
 code/modules/food/candy_maker.dm                              | 3 +--
 code/modules/reagents/reagent_containers/food/snacks/candy.dm | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/food/candy_maker.dm b/code/modules/food/candy_maker.dm
index c6fe36f48b1..cfe59a95209 100644
--- a/code/modules/food/candy_maker.dm
+++ b/code/modules/food/candy_maker.dm
@@ -323,8 +323,7 @@
 		for(var/i=1,i<efficiency,i++)
 			cooked = new cooked.type(loc)
 		if(byproduct)
-			byproduct.loc = src.loc
-			byproduct = new byproduct.type(loc)
+			new byproduct(loc)
 		return
 
 /obj/machinery/candy_maker/proc/wzhzhzh(var/seconds as num)
diff --git a/code/modules/reagents/reagent_containers/food/snacks/candy.dm b/code/modules/reagents/reagent_containers/food/snacks/candy.dm
index 6a0759c2bcc..5d8cd4e7a8e 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/candy.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/candy.dm
@@ -718,7 +718,7 @@
 
 	New()
 		..()
-		reagents.add_reagent("lexorin", 20)
+		reagents.add_reagent("sulfonal", 20)
 		reagents.del_reagent("sugar")
 		reagents.update_total()
 		bitesize = 4