From 14a5985891de882a99539a41ffacfe071329a181 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 17 Apr 2020 23:00:05 -0700 Subject: [PATCH] Adds more service stuff to lathes. --- code/modules/research/designs/misc_designs.dm | 29 ++++++++++++++++--- code/modules/research/techweb/all_nodes.dm | 4 +-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index c18c33b04b..04b7bbc668 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -293,20 +293,20 @@ name = "Broom" desc = "Just your everyday standard broom." id = "broom" - build_type = PROTOLATHE + build_type = PROTOLATHE | AUTOLATHE materials = list(/datum/material/iron = 1000, /datum/material/glass = 600) build_path = /obj/item/twohanded/broom - category = list("Equipment") + category = list("initial", "Equipment", "Misc") departmental_flags = DEPARTMENTAL_FLAG_SERVICE /datum/design/mop name = "Mop" desc = "Just your everyday standard mop." id = "mop" - build_type = PROTOLATHE + build_type = PROTOLATHE | AUTOLATHE materials = list(/datum/material/iron = 1200, /datum/material/glass = 100) build_path = /obj/item/mop - category = list("Equipment") + category = list("initial", "Equipment", "Misc") departmental_flags = DEPARTMENTAL_FLAG_SERVICE /datum/design/advmop @@ -329,6 +329,16 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SERVICE +/datum/design/normtrash + name = "Trashbag" + desc = "It's a bag for trash, you put garbage in it." + id = "normtrash" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 2000) + build_path = /obj/item/storage/bag/trash + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + /datum/design/blutrash name = "Trashbag of Holding" desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage." @@ -349,6 +359,17 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SERVICE +/datum/design/paint_remover + name = "Paint Remover" + desc = "Removes stains from the floor, and not much else." + id = "paint_remover" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + reagents_list = list(/datum/reagent/acetone = 60) + build_path = /obj/item/paint/paint_remover + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + /datum/design/spraybottle name = "Spray Bottle" desc = "A spray bottle, with an unscrewable top." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index dafa119873..285be25f9b 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -544,7 +544,7 @@ display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." prereq_ids = list("base") - design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom") + design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500) /datum/techweb_node/basic_mining @@ -568,7 +568,7 @@ display_name = "Advanced Sanitation Technology" description = "Clean things better, faster, stronger, and harder!" prereq_ids = list("adv_engi") - design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor") + design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor", "paint_remover") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1750) // No longer has its bag /datum/techweb_node/botany