Merge pull request #2886 from FalseIncarnate/master

Assorted Sprite-Related Fixes

code/modules/reagents/newchem/food.dm

@@ -133,17 +133,17 @@ datum/reagent/honey/reaction_turf(var/turf/T, var/volume)
 	reagent_state = LIQUID
 	color = "#2E2418"
 
-datum/reagent/chocolate/on_mob_life(var/mob/living/M as mob)
+/datum/reagent/chocolate/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
 	M.reagents.add_reagent("sugar", 0.8)
 	..()
 	return
 
-datum/reagent/chocolate/reaction_turf(var/turf/T, var/volume)
+/datum/reagent/chocolate/reaction_turf(var/turf/T, var/volume)
 	src = null
 	if(volume >= 5)
-		new /obj/item/weapon/reagent_containers/food/snacks/reagentchocolatebar(T)
-		return
+		new /obj/item/weapon/reagent_containers/food/snacks/cocoa_pile(T)
+	return
 
 /datum/reagent/mugwort
 	name = "Mugwort"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -405,16 +405,15 @@
 		reagents.add_reagent("coco", 2)
 		bitesize = 2
 
-/obj/item/weapon/reagent_containers/food/snacks/reagentchocolatebar //for reagent chocolate
-	name = "Chocolate Bar"
-	desc = "A plain chocolate bar. Is it dark chocolate, milk chocolate? Who knows!"
-	icon_state = "chocolatebar"
+/obj/item/weapon/reagent_containers/food/snacks/cocoa_pile //for reagent chocolate being spilled on turfs
+	name = "Pile of Cocoa Powder"
+	desc = "A pile of pure cocoa powder."
+	icon_state = "cocoa"
 	filling_color = "#7D5F46"
 
 	New()
 		..()
-		reagents.add_reagent("sugar", 10)
-		reagents.add_reagent("chocolate",10)
+		reagents.add_reagent("chocolate",5)		//no longer can be used to generate the reagent infinitely
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/chocolateegg

code/modules/reagents/reagent_containers/food/snacks/candy.dm

@@ -10,6 +10,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/candy/
 	name = "generic candy"
 	desc = "It's placeholder flavored. This shouldn't be seen."
+	icon = 'icons/obj/food/candy.dmi'
 	icon_state = "candy"
 	New()
 		..()