diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm
index bff84484e7f..fcc683646cd 100644
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -174,7 +174,13 @@
 ********************/
 
 /obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(default_deconstruction_screwdriver(user, "smartfridge_open", "smartfridge", O))
+	if(istype(O, /obj/item/weapon/screwdriver) && anchored)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+		panel_open = !panel_open
+		user << "You [panel_open ? "open" : "close"] the maintenance panel."
+		overlays.Cut()
+		if(panel_open)
+			overlays += image(icon, "[initial(icon_state)]-panel")
 		return
 
 	if(exchange_parts(user, O))
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 8524a6cbcf2..1486cb4473d 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -4,6 +4,8 @@
 	icon = 'icons/obj/flamethrower.dmi'
 	icon_state = "flamethrowerbase"
 	item_state = "flamethrower_0"
+	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
 	flags = CONDUCT
 	force = 3.0
 	throwforce = 10.0
diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm
index ed244f15ae0..20661ecd1ce 100644
--- a/code/modules/reagents/newchem/food.dm
+++ b/code/modules/reagents/newchem/food.dm
@@ -133,17 +133,19 @@ 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
+	var/volume_left = volume
+	while(volume_left >= 5)
+		new /obj/item/weapon/reagent_containers/food/snacks/cocoa_pile(T)
+		volume_left -= 5
+	return
 
 /datum/reagent/mugwort
 	name = "Mugwort"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index a033b45682e..94d442476af 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/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
diff --git a/code/modules/reagents/reagent_containers/food/snacks/candy.dm b/code/modules/reagents/reagent_containers/food/snacks/candy.dm
index 95e82f869e2..8e067cef75f 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/candy.dm
+++ b/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()
 		..()
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 1e34467073f..ee9e6b4429f 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/obj/candy.dmi b/icons/obj/candy.dmi
index 68c6cbe991d..6f3d11c365e 100644
Binary files a/icons/obj/candy.dmi and b/icons/obj/candy.dmi differ
diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi
new file mode 100644
index 00000000000..052a6e8ab3a
Binary files /dev/null and b/icons/obj/food/candy.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index b0a652de4f5..f8728eb6ab3 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi
index 3591c442232..2a8bac86a9d 100644
Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ