diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index 23f9581fedc..fcb954a18eb 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -128,31 +128,6 @@ var/h_b = 245.0 -/obj/machinery/computer/med_data - name = "Medical Records" - desc = "This can be used to check medical records." - icon_state = "medcomp" - req_access = list(access_medical) - circuit = "/obj/item/weapon/circuitboard/med_data" - var/obj/item/weapon/card/id/scan = null - var/obj/item/weapon/disk/records/disk = null - var/authenticated = null - var/rank = null - var/screen = null - var/datum/data/record/active1 = null - var/datum/data/record/active2 = null - var/a_id = null - var/temp = null - var/printing = null - var/list/Perp - var/tempname = null - - -/obj/machinery/computer/med_data/laptop - name = "Medical Laptop" - desc = "Cheap Nanotrasen Laptop." - icon_state = "medlaptop" - /obj/machinery/computer/pod name = "Pod Launch Control" diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 3c200f6158a..c7035736f6d 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -1,3 +1,24 @@ +/obj/machinery/computer/med_data//TODO:SANITY + name = "Medical Records" + desc = "This can be used to check medical records." + icon_state = "medcomp" + req_access = list(access_medical) + circuit = "/obj/item/weapon/circuitboard/med_data" + var + obj/item/weapon/card/id/scan = null + obj/item/weapon/disk/records/disk = null + authenticated = null + rank = null + screen = null + datum/data/record/active1 = null + datum/data/record/active2 = null + a_id = null + temp = null + printing = null + list/Perp + tempname = null + + /obj/machinery/computer/med_data/attackby(obj/item/O as obj, user as mob) if(istype(O, /obj/item/weapon/card/id) && !scan) usr.drop_item() @@ -21,7 +42,6 @@ if(..()) return var/dat - if (src.temp) dat = text("[src.temp]

Clear Screen") else @@ -540,3 +560,8 @@ src.updateUsrDialog() return + +/obj/machinery/computer/med_data/laptop + name = "Medical Laptop" + desc = "Cheap Nanotrasen Laptop." + icon_state = "medlaptop"