Fixes cloning and genetics consoles pointing to the machines (#17193)

This commit is contained in:
S34N
2021-12-11 10:59:14 +00:00
committed by GitHub
parent 9845dad461
commit 41e22cf7e9
2 changed files with 19 additions and 21 deletions
+12 -9
View File
@@ -359,17 +359,20 @@
else
return ..()
/obj/machinery/computer/scan_consolenew/New()
..()
/obj/machinery/computer/scan_consolenew/Initialize(mapload)
. = ..()
for(var/i=0;i<3;i++)
buffers[i+1]=new /datum/dna2/record
spawn(5)
for(dir in list(NORTH,EAST,SOUTH,WEST))
connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
if(!isnull(connected))
break
spawn(250)
injector_ready = TRUE
addtimer(CALLBACK(src, .proc/find_machine), 1 SECONDS)
addtimer(CALLBACK(src, .proc/ready), 25 SECONDS)
/obj/machinery/computer/scan_consolenew/proc/find_machine()
for(var/obj/machinery/dna_scannernew/scanner in orange(1, src))
connected = scanner
return
/obj/machinery/computer/scan_consolenew/proc/ready()
injector_ready = TRUE
/obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(list/buffer)
var/list/arr = list()
+7 -12
View File
@@ -25,8 +25,8 @@
light_color = LIGHT_COLOR_DARKBLUE
/obj/machinery/computer/cloning/Initialize()
..()
/obj/machinery/computer/cloning/Initialize(mapload)
. = ..()
pods = list()
records = list()
set_scan_temp("Scanner ready.", "good")
@@ -61,20 +61,15 @@
selected_pod = pods[1]
/obj/machinery/computer/cloning/proc/findscanner()
var/obj/machinery/dna_scannernew/scannerf = null
//Try to find scanner on adjacent tiles first
for(dir in list(NORTH,EAST,SOUTH,WEST))
scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
if(scannerf)
return scannerf
for(var/obj/machinery/dna_scannernew/scanner in orange(1, src))
return scanner
//Then look for a free one in the area
if(!scannerf)
for(var/obj/machinery/dna_scannernew/S in get_area(src))
return S
for(var/obj/machinery/dna_scannernew/S in get_area(src))
return S
return 0
return FALSE
/obj/machinery/computer/cloning/proc/releasecloner()
for(var/obj/machinery/clonepod/P in pods)