From 385aea3d14870c4c37374bed1955797516476167 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 4 Feb 2020 18:50:09 -0600 Subject: [PATCH 1/3] rcd ammo to indeng, typo --- code/modules/research/designs/misc_designs.dm | 2 +- code/modules/research/techweb/all_nodes.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 0059e0c417..3867fa9f23 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -405,7 +405,7 @@ /datum/design/holosigncombifan name = "ATMOS Holo-Combifan Projector" - desc = "A holographic projector that creates holographic barriesr that prevent changes in atmospheric and temperature conditions." + desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric and temperature conditions." id = "holosigncombifan" build_type = PROTOLATHE materials = list(MAT_METAL = 7500, MAT_GLASS = 2500, MAT_SILVER = 2500, MAT_GOLD = 2500, MAT_TITANIUM = 1750) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 15e88fc811..e1abfedde6 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -191,7 +191,7 @@ prereq_ids = list("base") design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin", "atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", - "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine") + "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000) export_price = 5000 From 6efe0dc273442e423b72c06238f8b86382cd5cee Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 4 Feb 2020 18:55:19 -0600 Subject: [PATCH 2/3] haha what if i made everything interfacable --- code/modules/research/machinery/_production.dm | 2 +- .../research/machinery/departmental_circuit_imprinter.dm | 3 +-- code/modules/research/machinery/departmental_protolathe.dm | 3 +-- code/modules/research/machinery/techfab.dm | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 659a83c703..25e8b82cc4 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -2,7 +2,7 @@ name = "technology fabricator" desc = "Makes researched and prototype items with materials and energy." layer = BELOW_OBJ_LAYER - var/consoleless_interface = FALSE //Whether it can be used without a console. + var/consoleless_interface = TRUE //Whether it can be used without a console. var/efficiency_coeff = 1 //Materials needed / coeff = actual. var/list/categories = list() var/datum/component/remote_materials/materials diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm index 623c40462a..336803c011 100644 --- a/code/modules/research/machinery/departmental_circuit_imprinter.dm +++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm @@ -4,10 +4,9 @@ icon_state = "circuit_imprinter" circuit = /obj/item/circuitboard/machine/circuit_imprinter/department requires_console = FALSE - consoleless_interface = TRUE /obj/machinery/rnd/production/circuit_imprinter/department/science name = "department circuit imprinter (Science)" circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE - department_tag = "Science" \ No newline at end of file + department_tag = "Science" diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index 0f9257cbeb..afea8248f3 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -4,7 +4,6 @@ icon_state = "protolathe" circuit = /obj/item/circuitboard/machine/protolathe/department requires_console = FALSE - consoleless_interface = TRUE /obj/machinery/rnd/production/protolathe/department/engineering name = "department protolathe (Engineering)" @@ -40,4 +39,4 @@ name = "department protolathe (Security)" allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY department_tag = "Security" - circuit = /obj/item/circuitboard/machine/protolathe/department/security \ No newline at end of file + circuit = /obj/item/circuitboard/machine/protolathe/department/security diff --git a/code/modules/research/machinery/techfab.dm b/code/modules/research/machinery/techfab.dm index 885f27c2cb..f93560ed10 100644 --- a/code/modules/research/machinery/techfab.dm +++ b/code/modules/research/machinery/techfab.dm @@ -31,5 +31,4 @@ console_link = FALSE production_animation = "protolathe_n" requires_console = FALSE - consoleless_interface = TRUE allowed_buildtypes = PROTOLATHE | IMPRINTER From f100b6c5e48a237daf885c3ea62bbbb99cafcfdd Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 5 Feb 2020 19:47:20 -0600 Subject: [PATCH 3/3] multitools in basic tools, dumb headers --- .../autolathe_desings/autolathe_designs_construction.dm | 8 ++++---- .../designs/autolathe_desings/autolathe_designs_tools.dm | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm index c3e3993cb2..bfc92d24d8 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm @@ -1,11 +1,11 @@ /////////////////////////////////// -//////////Autolathe Designs /////// +//////////Autolathe Designs//////// /////////////////////////////////// -//////////////// -///Construction// -//////////////// +////////////////// +///Construction/// +////////////////// /datum/design/rods name = "Metal Rod" diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm index c413f546f0..6affacf1b1 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm @@ -1,8 +1,8 @@ /////////////////////////////////// -//////////Autolathe Designs /////// +/////////Autolathe Designs///////// /////////////////////////////////// /////////// -///Tools // +///Tools/// /////////// /datum/design/bucket name = "Bucket" @@ -52,7 +52,8 @@ build_type = AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 20) build_path = /obj/item/multitool - category = list("initial","Tools") + category = list("initial","Tools","Tool Designs") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/analyzer name = "Analyzer"