cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add scan_consolenew to refactor.

Browse Source
This commit is contained in:
ESwordTheCat
2014-05-23 06:04:52 -08:00
parent 65e4db24d3
commit d585a1f842
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
code/game/dna/dna_modifier.dm
View File

@@ -289,6 +289,11 @@
icon = 'icons/obj/computer.dmi'
icon_state = "scanner"
density = 1
anchored = 1
idle_power_usage = 200
active_power_usage = 400
var/selected_ui_block = 1.0
var/selected_ui_subblock = 1.0
var/selected_se_block = 1.0
@@ -299,15 +304,16 @@
var/radiation_intensity = 1.0
var/list/datum/dna2/record/buffers[3]
var/irradiating = 0
var/injector_ready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete
var/obj/machinery/dna_scannernew/connected = null
var/obj/item/weapon/disk/data/disk = null
var/selected_menu_key = null
anchored = 1
use_power = 1
idle_power_usage = 10
active_power_usage = 400
var/waiting_for_user_input=0 // Fix for #274 (Mash create block injector without answering dialog to make unlimited injectors) - N3X
// Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete.
var/injector_ready = 0
var/obj/machinery/dna_scannernew/connected
var/obj/item/weapon/disk/data/disk
var/selected_menu_key
// Fix for #274 (Mash create block injector without answering dialog to make unlimited injectors) - N3X.
var/waiting_for_user_input = 0
/obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/screwdriver))
@@ -415,14 +421,25 @@
src.disk = W
user << "You insert [W]."
nanomanager.update_uis(src) // update all UIs attached to src()
/obj/machinery/computer/scan_consolenew/process()
if (stat & (BROKEN | NOPOWER | MAINT | EMPED))
use_power = 0
return
if (connected && connected.occupant)
use_power = 2
else
use_power = 1
/*
/obj/machinery/computer/scan_consolenew/process() //not really used right now
if(stat & (NOPOWER|BROKEN))
return
if (!( src.status )) //remove this
return
return
*/
/obj/machinery/computer/scan_consolenew/attack_paw(user as mob)
ui_interact(user)