From 4d7f5863f973b694ecc4aa20d7355745f19bb18c Mon Sep 17 00:00:00 2001 From: Timberpoes Date: Mon, 22 Jun 2020 14:48:19 +0100 Subject: [PATCH] Change genetics machine department flags, fix inconsistency (#51670) --- .../game/objects/effects/spawners/lootdrop.dm | 6 ++--- .../circuitboards/computer_circuitboards.dm | 12 +++++----- .../circuitboards/machine_circuitboards.dm | 22 +++++++++---------- .../research/designs/comp_board_designs.dm | 6 ++--- .../research/designs/machine_designs.dm | 17 +++++++------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index a46f315d17c..a7fca2dd437 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -368,7 +368,9 @@ /obj/item/circuitboard/computer/nanite_cloud_controller, /obj/item/circuitboard/machine/nanite_chamber, /obj/item/circuitboard/machine/nanite_programmer, - /obj/item/circuitboard/machine/nanite_program_hub + /obj/item/circuitboard/machine/nanite_program_hub, + /obj/item/circuitboard/computer/scan_consolenew, + /obj/item/circuitboard/machine/dnascanner ) /obj/effect/spawner/lootdrop/techstorage/security @@ -405,11 +407,9 @@ name = "medical circuit board spawner" loot = list( /obj/item/circuitboard/machine/chem_dispenser, - /obj/item/circuitboard/computer/scan_consolenew, /obj/item/circuitboard/computer/med_data, /obj/item/circuitboard/machine/smoke_machine, /obj/item/circuitboard/machine/chem_master, - /obj/item/circuitboard/machine/dnascanner, /obj/item/circuitboard/computer/pandemic ) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 478682b7c4f..2943baa58a1 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -288,11 +288,6 @@ icon_state = "medical" build_path = /obj/machinery/computer/pandemic -/obj/item/circuitboard/computer/scan_consolenew - name = "DNA Machine (Computer Board)" - icon_state = "medical" - build_path = /obj/machinery/computer/scan_consolenew - //Science /obj/item/circuitboard/computer/aifixer @@ -355,10 +350,15 @@ build_path = /obj/machinery/computer/teleporter /obj/item/circuitboard/computer/xenobiology - name = "circuit board (Xenobiology Console)" + name = "Xenobiology Console (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/camera_advanced/xenobio +/obj/item/circuitboard/computer/scan_consolenew + name = "DNA Console (Computer Board)" + icon_state = "science" + build_path = /obj/machinery/computer/scan_consolenew + //Security /obj/item/circuitboard/computer/labor_shuttle diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 410face59cc..3637611e795 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -667,17 +667,6 @@ else return ..() -/obj/item/circuitboard/machine/dnascanner - name = "DNA Scanner (Machine Board)" - icon_state = "medical" - build_path = /obj/machinery/dna_scannernew - req_components = list( - /obj/item/stock_parts/scanning_module = 1, - /obj/item/stock_parts/matter_bin = 1, - /obj/item/stock_parts/micro_laser = 1, - /obj/item/stack/sheet/glass = 1, - /obj/item/stack/cable_coil = 2) - /obj/item/circuitboard/machine/cryo_tube name = "Cryotube (Machine Board)" icon_state = "medical" @@ -956,6 +945,17 @@ /obj/item/stock_parts/micro_laser = 1, /obj/item/stock_parts/scanning_module = 1) +/obj/item/circuitboard/machine/dnascanner + name = "DNA Scanner (Machine Board)" + icon_state = "science" + build_path = /obj/machinery/dna_scannernew + req_components = list( + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stack/sheet/glass = 1, + /obj/item/stack/cable_coil = 2) + //Security /obj/item/circuitboard/machine/protolathe/department/security diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 61fe825bc30..cae328fd0ba 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -89,12 +89,12 @@ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL /datum/design/board/scan_console - name = "Computer Design (DNA Machine)" - desc = "Allows for the construction of circuit boards used to build a new DNA scanning console." + name = "Computer Design (DNA Console)" + desc = "Allows for the construction of circuit boards used to build a new DNA console." id = "scan_console" build_path = /obj/item/circuitboard/computer/scan_consolenew category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE /datum/design/board/comconsole name = "Computer Design (Communications)" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 46e97dc4c34..1808538b772 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -184,15 +184,6 @@ build_path = /obj/item/circuitboard/machine/reagentgrinder category = list ("Medical Machinery") - -/datum/design/board/dnascanner - name = "Machine Design (DNA Scanner)" - desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." - id = "dnascanner" - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - build_path = /obj/item/circuitboard/machine/dnascanner - category = list("Medical Machinery") - /datum/design/board/hypnochair name = "Machine Design (Enhanced Interrogation Chamber)" desc = "Allows for the construction of circuit boards used to build an Enhanced Interrogation Chamber." @@ -329,6 +320,14 @@ category = list("Research Machinery") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE +/datum/design/board/dnascanner + name = "Machine Design (DNA Scanner)" + desc = "The circuit board for a DNA Scanner." + id = "dnascanner" + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + build_path = /obj/item/circuitboard/machine/dnascanner + category = list("Research Machinery") + /datum/design/board/microwave name = "Machine Design (Microwave Board)" desc = "The circuit board for a microwave."