diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 4837e64e89..809760abc9 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -28,7 +28,7 @@
var/list/buffer[NUMBER_OF_BUFFERS]
- var/injectorready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete
+ var/injectorready = 0 //world timer cooldown var
var/current_screen = "mainmenu"
var/obj/machinery/dna_scannernew/connected = null
var/obj/item/weapon/disk/data/diskette = null
@@ -61,8 +61,7 @@
connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
if(!isnull(connected))
break
- spawn(250)
- injectorready = 1
+ injectorready = world.time + INJECTOR_TIMEOUT
return
return
@@ -213,7 +212,7 @@
else
temp_html += "Occupant"
temp_html += "Occupant:Delayed "
- if(injectorready)
+ if(injectorready < world.time)
temp_html += "Injector"
else
temp_html += "Injector"
@@ -227,7 +226,7 @@
else
temp_html += "Occupant"
temp_html += "Occupant:Delayed "
- if(injectorready)
+ if(injectorready < world.time)
temp_html += "Injector"
else
temp_html += "Injector"
@@ -240,7 +239,7 @@
else
temp_html += "Occupant"
temp_html += "Occupant:Delayed "
- if(injectorready)
+ if(injectorready < world.time)
temp_html += "UI+UE Injector"
else
temp_html += "UI+UE Injector"
@@ -251,7 +250,7 @@
else
temp_html += "Occupant "
temp_html += "Occupant:Delayed "
- if(injectorready)
+ if(injectorready < world.time )
temp_html += "Injector"
else
temp_html += "Injector"
@@ -391,7 +390,7 @@
if("mixed")
apply_buffer(SCANNER_ACTION_MIXED,num)
if("injector")
- if(num && injectorready)
+ if(num && injectorready < world.time)
num = Clamp(num, 1, NUMBER_OF_BUFFERS)
var/list/buffer_slot = buffer[num]
if(istype(buffer_slot))
@@ -439,9 +438,7 @@
if(connected)
I.damage_coeff = connected.damage_coeff
if(I)
- injectorready = 0
- spawn(INJECTOR_TIMEOUT)
- injectorready = 1
+ injectorready = world.time + INJECTOR_TIMEOUT
if("loaddisk")
if(num && diskette && diskette.fields)
num = Clamp(num, 1, NUMBER_OF_BUFFERS)