Merge branch 'master' into Arokha/matdefs

code/game/objects/items/weapons/material/kitchen.dm

@@ -75,6 +75,26 @@
 /obj/item/weapon/material/kitchen/utensil/fork/plastic
 	default_material = "plastic"
 
+/obj/item/weapon/material/kitchen/utensil/foon
+	name = "foon"
+	desc = "It's a foon. The forgotten cousin of the spork."
+	icon_state = "foon"
+	sharp = TRUE
+	edge = FALSE
+
+/obj/item/weapon/material/kitchen/utensil/foon/plastic
+	default_material = "plastic"
+
+/obj/item/weapon/material/kitchen/utensil/spork
+	name = "spork"
+	desc = "It's a spork. The (un)holy merger of a spoon and fork."
+	icon_state = "spork"
+	sharp = TRUE
+	edge = FALSE
+
+/obj/item/weapon/material/kitchen/utensil/spork/plastic
+	default_material = "plastic"
+
 /obj/item/weapon/material/kitchen/utensil/spoon
 	name = "spoon"
 	desc = "It's a spoon. You can see your own upside-down face in it."

code/game/objects/items/weapons/material/knives.dm

@@ -123,6 +123,16 @@
 	icon_state = "render"
 	applies_material_colour = 0
 
+/obj/item/weapon/material/knife/table
+	name = "table knife"
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "knife_table"
+	sharp = FALSE // blunted tip
+	force_divisor = 0.1
+
+/obj/item/weapon/material/knife/table/plastic
+	default_material = "plastic"
+
 /obj/item/weapon/material/knife/butch
 	name = "butcher's cleaver"
 	icon_state = "butch"