diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index efbe9e28f11..1f64778f662 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -41,6 +41,7 @@ "Machinery", "Medical", "Misc", + "Dinnerware", "Imported" ) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 35d1e599b41..9d3ac9f9fbc 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -20,6 +20,7 @@ throwforce = 0 throw_speed = 3 throw_range = 5 + materials = list(MAT_METAL=80) flags = CONDUCT origin_tech = "materials=1" attack_verb = list("attacked", "stabbed", "poked") @@ -93,6 +94,7 @@ flags = CONDUCT force = 15 throwforce = 10 + materials = list(MAT_METAL=18000) attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") w_class = 3 diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index 1d1888053d0..83724c659d3 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -229,6 +229,7 @@ name = "shaker" desc = "A metal shaker to mix drinks in." icon_state = "shaker" + materials = list(MAT_METAL=1500) amount_per_transfer_from_this = 10 volume = 100 diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index bd1dce950cf..29a2244d732 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -6,6 +6,7 @@ icon_state = "glass_empty" amount_per_transfer_from_this = 10 volume = 50 + materials = list(MAT_GLASS=500) burn_state = FLAMMABLE burntime = 5 spillable = 1 @@ -538,6 +539,7 @@ amount_per_transfer_from_this = 15 possible_transfer_amounts = list() volume = 15 + materials = list(MAT_GLASS=100) /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change() if (gulp_size < 15) diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/food&drinks/food/customizables.dm index e26b90317d0..79c391b065f 100644 --- a/code/modules/food&drinks/food/customizables.dm +++ b/code/modules/food&drinks/food/customizables.dm @@ -300,6 +300,7 @@ icon = 'icons/obj/food/soupsalad.dmi' icon_state = "bowl" flags = OPENCONTAINER + materials = list(MAT_GLASS = 500) w_class = 3 /obj/item/weapon/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index d8076cbb370..11dad068b2d 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -229,7 +229,47 @@ build_type = AUTOLATHE materials = list(MAT_METAL = 12000) build_path = /obj/item/weapon/kitchen/knife - category = list("initial","Misc") + category = list("initial","Dinnerware") + +/datum/design/fork + name = "Fork" + id = "fork" + build_type = AUTOLATHE + materials = list(MAT_METAL = 80) + build_path = /obj/item/weapon/kitchen/fork + category = list("initial","Dinnerware") + +/datum/design/bowl + name = "Bowl" + id = "bowl" + build_type = AUTOLATHE + materials = list(MAT_GLASS = 500) + build_path = /obj/item/weapon/reagent_containers/glass/bowl + category = list("initial","Dinnerware") + +/datum/design/drinking_glass + name = "Drinking glass" + id = "drinking_glass" + build_type = AUTOLATHE + materials = list(MAT_GLASS = 500) + build_path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass + category = list("initial","Dinnerware") + +/datum/design/shot_glass + name = "Shot glass" + id = "shot_glass" + build_type = AUTOLATHE + materials = list(MAT_GLASS = 100) + build_path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass + category = list("initial","Dinnerware") + +/datum/design/shaker + name = "Shaker" + id = "shaker" + build_type = AUTOLATHE + materials = list(MAT_METAL = 1500) + build_path = /obj/item/weapon/reagent_containers/food/drinks/shaker + category = list("initial","Dinnerware") /datum/design/cultivator name = "Cultivator" @@ -616,6 +656,14 @@ build_path = /obj/item/ammo_box/c9mm category = list("hacked", "Security") +/datum/design/cleaver + name = "Butcher's cleaver" + id = "cleaver" + build_type = AUTOLATHE + materials = list(MAT_METAL = 18000) + build_path = /obj/item/weapon/kitchen/knife/butcher + category = list("hacked", "Dinnerware") + /datum/design/spraycan name = "Spraycan" id = "spraycan"