diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 023ceed2351..cfb8f17e08a 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -75,7 +75,7 @@ /obj/machinery/dna_scannernew/Initialize(mapload) . = ..() component_parts = list() - component_parts += new /obj/item/circuitboard/clonescanner(null) + component_parts += new /obj/item/circuitboard/dna_scanner(null) component_parts += new /obj/item/stock_parts/scanning_module(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stock_parts/micro_laser(null) @@ -87,7 +87,7 @@ /obj/machinery/dna_scannernew/upgraded/Initialize(mapload) . = ..() component_parts = list() - component_parts += new /obj/item/circuitboard/clonescanner(null) + component_parts += new /obj/item/circuitboard/dna_scanner(null) component_parts += new /obj/item/stock_parts/scanning_module/phasic(null) component_parts += new /obj/item/stock_parts/manipulator/pico(null) component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) @@ -253,14 +253,6 @@ update_icon(UPDATE_ICON_STATE) SStgui.update_uis(src) - // search for ghosts, if the corpse is empty and the scanner is connected to a cloner - if(locate(/obj/machinery/computer/cloning, get_step(src, NORTH)) \ - || locate(/obj/machinery/computer/cloning, get_step(src, SOUTH)) \ - || locate(/obj/machinery/computer/cloning, get_step(src, EAST)) \ - || locate(/obj/machinery/computer/cloning, get_step(src, WEST))) - - occupant.notify_ghost_cloning(source = src) - /obj/machinery/dna_scannernew/proc/go_out(mob/user, force) if(!occupant) if(user) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index e3c9877aa5c..96bd846fd7d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -841,6 +841,18 @@ to destroy them and players will be able to make replacements. /obj/item/stack/sheet/glass = 1, /obj/item/stack/cable_coil = 2,) +/obj/item/circuitboard/dna_scanner + board_name = "DNA Modifier" + icon_state = "medical" + build_path = /obj/machinery/dna_scannernew + board_type = "machine" + origin_tech = "programming=2;biotech=2" + req_components = list(/obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stack/sheet/glass = 1, + /obj/item/stack/cable_coil = 2) + /obj/item/circuitboard/mech_recharger board_name = "Mech Bay Recharger" icon_state = "science" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 7997892d617..e75dc5db032 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -172,6 +172,16 @@ build_path = /obj/item/circuitboard/clonescanner category = list("Medical Machinery") +/datum/design/dna_scanner + name = "Machine Board (DNA Modifier)" + desc = "Allows for the construction of circuit boards used to build a DNA Modifier." + id = "dna_scanner" + req_tech = list("programming" = 4, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000) + build_path = /obj/item/circuitboard/dna_scanner + category = list("Medical Machinery") + /datum/design/cryotube name = "Machine Board (Cryotube Board)" desc = "Allows for the construction of circuit boards used to build a Cryotube."