diff --git a/code/__DEFINES/tools.dm b/code/__DEFINES/tools.dm
index e40b0302211d..f8f89c2007a9 100644
--- a/code/__DEFINES/tools.dm
+++ b/code/__DEFINES/tools.dm
@@ -16,9 +16,9 @@
 #define TOOL_SAW "saw"
 #define TOOL_KNIFE "knife"
 #define TOOL_ROLLINGPIN "rollingpin"
-#define TOOL_BIKEHORN		"bike horn"
-// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
-// tool sound is only played when op is started. If not, it's played twice.
+
+/// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
+/// tool sound is only played when op is started. If not, it's played twice.
 #define MIN_TOOL_SOUND_DELAY 20
 
 /// When a tooltype_act proc is successful
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 2e160f667b59..c216847302d9 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -248,6 +248,21 @@
 	custom_price = 20
 	tool_behaviour = TOOL_ROLLINGPIN
 
-/obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
-	user.visible_message("<span class='suicide'>[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return BRUTELOSS
+/* Trays  moved to /obj/item/storage/bag */
+
+/obj/item/kitchen/spoon/plastic
+	name = "plastic spoon"
+	desc = "Just be careful your food doesn't melt the spoon first."
+	icon_state = "plastic_spoon"
+	force = 0
+	w_class = WEIGHT_CLASS_TINY
+	throwforce = 0
+	custom_materials = list(/datum/material/plastic=120)
+	custom_price = 50
+	var/break_chance = 25
+
+/obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user)
+	.=..()
+	if(prob(break_chance))
+		user.visible_message(span_danger("[user]'s spoon snaps into tiny pieces in their hand."))
+		qdel(src)
diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm
index 88c1188f1dee..b2101b2f2102 100644
--- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm
+++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm
@@ -2,7 +2,7 @@
 /obj/item/reagent_containers/food/snacks/spaghetti
 	name = "spaghetti"
 	desc = "Now that's a nic'e pasta!"
-	icon = 'icons/obj/food/pizzaspaghetti.dmi'
+	icon = 'icons/obj/food/spaghetti.dmi'
 	icon_state = "spaghetti"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	cooked_type = /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti
diff --git a/shiptest.dme b/shiptest.dme
index 8d7ea4354c0f..95c7a13ed4da 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1222,13 +1222,8 @@
 #include "code\game\objects\items\devices\radio\headset.dm"
 #include "code\game\objects\items\devices\radio\intercom.dm"
 #include "code\game\objects\items\devices\radio\radio.dm"
-#include "code\game\objects\items\food\_food.dm"
-#include "code\game\objects\items\food\bread.dm"
 #include "code\game\objects\items\food\burgers.dm"
-#include "code\game\objects\items\food\cake.dm"
 #include "code\game\objects\items\food\pizza.dm"
-#include "code\game\objects\items\food\spaghetti.dm"
-#include "code\game\objects\items\grenades\_grenade.dm"
 #include "code\game\objects\items\grenades\antigravity.dm"
 #include "code\game\objects\items\grenades\chem_grenade.dm"
 #include "code\game\objects\items\grenades\clusterbuster.dm"