From 7f87f5067da28adefd88bd36dbfa0dc179db38d5 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 31 Jan 2023 03:11:18 +0100 Subject: [PATCH] [MIRROR] Adds the universal scanner to lathes [MDB IGNORE] (#19044) Adds the universal scanner to lathes (#73006) ## About The Pull Request Adds the basic tool back to autolathes and cargo protolathe This was in the game before #70314 so I think it's a fix more than an addition, but whatever ## Why It's Good For The Game Sometimes I like to sell things from custom vendors and I don't want to have to hunt down a roundstart cargonian just to get a price tagger. ## Changelog :cl: add: You can print universal scanners (export scanners, price taggers, sales taggers) from the lathe again /:cl: --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> --- .../designs/autolathe/multi-department_designs.dm | 13 +++++++++++++ code/modules/research/techweb/all_nodes.dm | 11 ++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/code/modules/research/designs/autolathe/multi-department_designs.dm b/code/modules/research/designs/autolathe/multi-department_designs.dm index 46cdaab2d71..aa91817c6c5 100644 --- a/code/modules/research/designs/autolathe/multi-department_designs.dm +++ b/code/modules/research/designs/autolathe/multi-department_designs.dm @@ -525,3 +525,16 @@ RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_FRAMES, ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +/datum/design/universal_scanner + name = "Universal Scanner" + desc = "A utility scanner that fills multiple roles: Exports, sales, and vendor price tags." + id = "universal_scanner" + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE + materials = list(/datum/material/iron = 1500, /datum/material/glass = 500) + build_path = /obj/item/universal_scanner + category = list( + RND_CATEGORY_INITIAL, + RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO + ) + departmental_flags = DEPARTMENT_BITFLAG_CARGO diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 2ab18087d87..3b68375aa3a 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -125,6 +125,7 @@ "turbine_part_rotor", "turbine_part_stator", "turret_control", + "universal_scanner", "voice_analyzer", "watering_can", ) @@ -589,15 +590,18 @@ "adv_scanning", "airalarm_electronics", "airlock_board", + "anomaly_refinery", "apc_control", "atmos_control", + "atmos_thermal", "atmosalerts", "autolathe", "cell_charger", "crystallizer", "electrolyzer", - "emergency_oxygen", "emergency_oxygen_engi", + "emergency_oxygen", + "emitter", "firealarm_electronics", "firelock_board", "grounding_rod", @@ -619,14 +623,11 @@ "solarcontrol", "stack_console", "stack_machine", + "tank_compressor", "tesla_coil", "thermomachine", "w-recycler", - "emitter", "welding_goggles", - "anomaly_refinery", - "tank_compressor", - "atmos_thermal", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 12500) discount_experiments = list(/datum/experiment/scanning/random/material/easy = 7500)