From f2e6fa022d2a3e8846497a05fe4a09d5494e517f Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Mon, 2 Nov 2020 23:31:14 -0500 Subject: [PATCH] Service Protolathe Changes (#54697) About The Pull Request Moves Light Replacer to Equipment Tab Adds Trash Bag as a printable item (Plastic, Service Lathe) Adds Paint Remover as printable item (Needs Advanced Sanitation) Fix: Allows you to print broom in Service Lathe Why It's Good For The Game Tiny Fix and QoL improvement for janitors. You can now get all of the items you (generally) need from advanced sanitation in a single tab. In addition to that, it gives a janitor who's lost his paint cleaner a way to get more. You can now get it by asking a chemist for help, -or- from the cargo order. --- code/modules/research/designs/misc_designs.dm | 31 +++++++++++++++++++ .../modules/research/designs/power_designs.dm | 10 ------ code/modules/research/techweb/all_nodes.dm | 4 +-- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index ec7c217089e..ad0efcad751 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -348,6 +348,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." @@ -358,6 +368,16 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SERVICE +/datum/design/light_replacer + name = "Light Replacer" + desc = "A device to automatically replace lights. Refill with working light bulbs." + id = "light_replacer" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1500, /datum/material/silver = 150, /datum/material/glass = 3000) + build_path = /obj/item/lightreplacer + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_ENGINEERING + /datum/design/buffer name = "Floor Buffer Upgrade" desc = "A floor buffer that can be attached to vehicular janicarts." @@ -368,6 +388,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/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index aa0999b2227..c4443466ad9 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -56,16 +56,6 @@ category = list("Misc","Power Designs") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING -/datum/design/light_replacer - name = "Light Replacer" - desc = "A device to automatically replace lights. Refill with working light bulbs." - id = "light_replacer" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 1500, /datum/material/silver = 150, /datum/material/glass = 3000) - build_path = /obj/item/lightreplacer - category = list("Power Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_ENGINEERING - /datum/design/inducer name = "Inducer" desc = "The NT-75 Electromagnetic Power Inducer can wirelessly induce electric charge in an object, allowing you to recharge power cells without having to remove them." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 86b5456d228..2273c53fd56 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -49,7 +49,7 @@ display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "decal_painter", - "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "secateurs", "mop", "plunger", "spraycan", "swab", "petri_dish") + "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "secateurs", "mop", "pushbroom", "plunger", "spraycan", "swab", "petri_dish", "normtrash") /datum/techweb_node/basic_medical id = "basic_medical" @@ -499,7 +499,7 @@ display_name = "Advanced Sanitation Technology" description = "Clean things better, faster, stronger, and harder!" prereq_ids = list("adv_engi") - design_ids = list("holobarrier_jani", "advmop", "buffer", "blutrash", "light_replacer", "spraybottle", "beartrap") + design_ids = list("holobarrier_jani", "advmop", "buffer", "blutrash", "light_replacer", "spraybottle", "beartrap", "paint_remover") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) /datum/techweb_node/botany