From 73be1a80c03595a82ccca24ee6ef98c0c24f215a Mon Sep 17 00:00:00 2001 From: erwgd Date: Mon, 11 Apr 2016 22:19:15 +0100 Subject: [PATCH 1/5] Created Dinnerware category for autolathe Changed category of kitchen knife from "Misc." to "Dinnerware" --- code/game/machinery/autolathe.dm | 1 + code/modules/research/designs/autolathe_designs.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index b728c258852..505d319ac54 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -221,7 +221,7 @@ 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/cultivator name = "Cultivator" From f0a6af827ee975641da9a469043e3711591e3e32 Mon Sep 17 00:00:00 2001 From: erwgd Date: Mon, 11 Apr 2016 22:57:58 +0100 Subject: [PATCH 2/5] Added bowl design to biogenerator.dm Added recipes for fork and drinking glass to autolathe_designs.dm Defined materials for fork, bowl, drinking glass --- code/game/objects/items/weapons/kitchen.dm | 1 + .../food&drinks/drinks/drinks/drinkingglass.dm | 1 + code/modules/food&drinks/food/customizables.dm | 1 + code/modules/hydroponics/biogenerator.dm | 5 +++++ .../research/designs/autolathe_designs.dm | 16 ++++++++++++++++ 5 files changed, 24 insertions(+) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 35d1e599b41..b1cf5e0e595 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") diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index d8629f5180e..08223fc7a94 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 diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/food&drinks/food/customizables.dm index e26b90317d0..c7b89f16ae2 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() w_class = 3 /obj/item/weapon/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index b67fff7abda..4e1f441e031 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -139,6 +139,7 @@ dat += "ActivateDetach Container" dat += "

Food:

" dat += "
" + dat += "Bowl: Makex5 ([10/efficiency])
" dat += "10 milk: Makex5 ([20/efficiency])
" dat += "10 cream: Makex5 ([30/efficiency])
" dat += "Milk carton: Makex5 ([100/efficiency])
" @@ -234,6 +235,10 @@ /obj/machinery/biogenerator/proc/create_product(create) switch(create) + if("bowl") + if (check_cost(10/efficiency)) + return 0 + else new/obj/item/weapon/reagent_containers/glass/bowl(src.loc) if("milk") if(check_container_volume(10)) return 0 diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 505d319ac54..607914577f0 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -223,6 +223,22 @@ build_path = /obj/item/weapon/kitchen/knife 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/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/cultivator name = "Cultivator" id = "cultivator" From 0078f91d8a3d4f58ce484f45ffd2335aca651034 Mon Sep 17 00:00:00 2001 From: erwgd Date: Tue, 12 Apr 2016 20:01:26 +0100 Subject: [PATCH 3/5] Added hacked autolathe design for butcher cleaver Defined materials for butcher cleaver --- code/game/objects/items/weapons/kitchen.dm | 1 + code/modules/research/designs/autolathe_designs.dm | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index b1cf5e0e595..9d3ac9f9fbc 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -94,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/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 607914577f0..98da68e9898 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -624,6 +624,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" From ca88d3f025918b71abadd8da67172466f52ed5c2 Mon Sep 17 00:00:00 2001 From: erwgd Date: Wed, 13 Apr 2016 17:17:15 +0100 Subject: [PATCH 4/5] added shot glass and shaker designs to autolathe defined materials for shot glass and shaker --- code/modules/food&drinks/drinks/drinks.dm | 1 + .../food&drinks/drinks/drinks/drinkingglass.dm | 1 + .../research/designs/autolathe_designs.dm | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index 0027198817c..b04cf555ab5 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 08223fc7a94..61ba6f7e847 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -535,6 +535,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/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 98da68e9898..6a58a3ecafb 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -239,6 +239,22 @@ 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" id = "cultivator" From 9d6247c890e7829733c534b7d8d8accf5d5daa34 Mon Sep 17 00:00:00 2001 From: erwgd Date: Thu, 14 Apr 2016 17:14:01 +0100 Subject: [PATCH 5/5] Removed bowl making code from biogenerator.dm Added bowl design to autolathe_designs.dm Changed bowl materials to 500 glass --- code/modules/food&drinks/food/customizables.dm | 2 +- code/modules/hydroponics/biogenerator.dm | 5 ----- code/modules/research/designs/autolathe_designs.dm | 8 ++++++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/food&drinks/food/customizables.dm index c7b89f16ae2..79c391b065f 100644 --- a/code/modules/food&drinks/food/customizables.dm +++ b/code/modules/food&drinks/food/customizables.dm @@ -300,7 +300,7 @@ icon = 'icons/obj/food/soupsalad.dmi' icon_state = "bowl" flags = OPENCONTAINER - materials = list() + 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/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 4e1f441e031..b67fff7abda 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -139,7 +139,6 @@ dat += "ActivateDetach Container" dat += "

Food:

" dat += "
" - dat += "Bowl: Makex5 ([10/efficiency])
" dat += "10 milk: Makex5 ([20/efficiency])
" dat += "10 cream: Makex5 ([30/efficiency])
" dat += "Milk carton: Makex5 ([100/efficiency])
" @@ -235,10 +234,6 @@ /obj/machinery/biogenerator/proc/create_product(create) switch(create) - if("bowl") - if (check_cost(10/efficiency)) - return 0 - else new/obj/item/weapon/reagent_containers/glass/bowl(src.loc) if("milk") if(check_container_volume(10)) return 0 diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 6a58a3ecafb..3ae8a31b170 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -231,6 +231,14 @@ 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"