From 2205c14b7dd175be13c41d372b29f947a699c691 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 4 Apr 2017 18:13:35 -0400 Subject: [PATCH] Fixes+Refactors Autopsy Scanner Printing --- code/game/objects/items/devices/autopsy.dm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index faa697ad8bd..f2ddc395eee 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -66,12 +66,8 @@ if(O.trace_chemicals[V] > 0 && !chemtraces.Find(V)) chemtraces += V -/obj/item/weapon/autopsy_scanner/verb/print_data() - set name = "Print Data" - set category = "Object" - set src in oview(1) - - if(usr.incapacitated()) +/obj/item/weapon/autopsy_scanner/attack_self(mob/user) + if(!wdata.len && !chemtraces.len) return var/scan_data = "" @@ -143,17 +139,17 @@ scan_data += chemID scan_data += "
" - usr.visible_message("[src] rattles and prints out a sheet of paper.") + user.visible_message("[src] rattles and prints out a sheet of paper.") playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) sleep(10) - var/obj/item/weapon/paper/P = new(usr.loc) + var/obj/item/weapon/paper/P = new(user.loc) P.name = "Autopsy Data ([target_name])" P.info = "[scan_data]" P.overlays += "paper_words" - usr.put_in_hands(P) + user.put_in_hands(P) /obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M, mob/living/carbon/user) if(!istype(M))