diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index b2443b4d8a7..36da44bbfb1 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -24,6 +24,21 @@
 	idle_power_usage = 2
 	active_power_usage = 500
 
+/obj/machinery/gibber/Initialize(mapload)
+	. = ..()
+	add_overlay("grjam")
+	component_parts = list()
+	component_parts += new /obj/item/circuitboard/gibber(null)
+	component_parts += new /obj/item/stock_parts/matter_bin(null)
+	component_parts += new /obj/item/stock_parts/manipulator(null)
+	RefreshParts()
+
+/obj/machinery/gibber/Destroy()
+	for(var/atom/movable/A in contents)
+		A.forceMove(get_turf(src))
+	occupant = null
+	return ..()
+
 /obj/machinery/gibber/suicide_act(mob/user)
 	if(occupant || locked)
 		return FALSE
@@ -36,21 +51,6 @@
 	addtimer(CALLBACK(src, .proc/startgibbing, user), 33)
 	return OBLITERATION
 
-/obj/machinery/gibber/Destroy()
-	if(contents.len)
-		for(var/atom/movable/A in contents)
-			A.loc = get_turf(src)
-	if(occupant)
-		occupant = null
-	return ..()
-
-/obj/machinery/gibber/RefreshParts() //If you want to make the machine upgradable, this is where you would change any vars basd on its stock parts.
-	return
-
-/obj/machinery/gibber/New()
-	..()
-	overlays += image('icons/obj/kitchen.dmi', "grjam")
-
 /obj/machinery/gibber/update_icon()
 	overlays.Cut()