diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 52cf7e10c69..909f5463d69 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -368,6 +368,7 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \ new/datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("plastic fork", /obj/item/weapon/kitchen/utensil/pfork, 1, on_floor = 1), \ new/datum/stack_recipe("plastic spoon", /obj/item/weapon/kitchen/utensil/pspoon, 1, on_floor = 1), \ + new/datum/stack_recipe("plastic spork", /obj/item/weapon/kitchen/utensil/pspork, 1, on_floor = 1), \ new/datum/stack_recipe("plastic knife", /obj/item/weapon/kitchen/knife/plastic, 1, on_floor = 1), \ new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1), \ new/datum/stack_recipe("bear mould", /obj/item/weapon/kitchen/mould/bear, 1, on_floor = 1), \ diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 4bf40a3ae15..c2067935ee6 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -82,6 +82,18 @@ icon_state = "pspoon" attack_verb = list("attacked", "poked") +/obj/item/weapon/kitchen/utensil/spork + name = "spork" + desc = "It's a spork. Marvel at its innovative design." + icon_state = "spork" + attack_verb = list("attacked", "sporked") + +/obj/item/weapon/kitchen/utensil/pspork + name = "plastic spork" + desc = "It's a plastic spork. It's the fork side of the spoon!" + icon_state = "pspork" + attack_verb = list("attacked", "sporked") + /* * Knives */ diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 7d174799b37..ebcb5ea92db 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -263,6 +263,22 @@ build_path = /obj/item/weapon/kitchen/utensil/fork category = list("initial","Dinnerware") +/datum/design/spoon + name = "Spoon" + id = "spoon" + build_type = AUTOLATHE + materials = list(MAT_METAL = 80) + build_path = /obj/item/weapon/kitchen/utensil/spoon + category = list("initial","Dinnerware") + +/datum/design/spork + name = "Spork" + id = "spork" + build_type = AUTOLATHE + materials = list(MAT_METAL = 80) + build_path = /obj/item/weapon/kitchen/utensil/spork + category = list("initial","Dinnerware") + /datum/design/tray name = "Tray" id = "tray" diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 33cf8adf5fb..d5dcc49c0fc 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ