Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738

Yet again, check the description.
This commit is contained in:
MlocMcMloc
2011-12-19 08:09:25 -08:00
31 changed files with 367 additions and 66 deletions

View File

@@ -132,9 +132,14 @@ obj/machinery/computer/forensic_scanning
var/mob/M = usr
var/obj/item/I = M.equipped()
if(I && istype(I))
scanning = I
M.drop_item()
I.loc = src
if(istype(I, /obj/item/weapon/evidencebag))
scanning = I.contents[1]
scanning.loc = src
I.underlays -= scanning
else
scanning = I
M.drop_item()
I.loc = src
else
temp = "Invalid Object Rejected."
if("scan")