cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 22:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Printing Fixes (#1476)

Browse Source 
Refactors machines to use /obj/machinery/proc/print() to print things to reduce redundant code.
Fixes #1433.
Fixes #1454.
This commit is contained in:
Lohikar
2017-01-08 16:44:42 -06:00
committed by skull132
parent b96f954762
commit 465b982eeb
29 changed files with 299 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/detectivework/microscope/dnascanner.dm
View File

@@ -102,8 +102,9 @@
src.visible_message("<span class='notice'>\icon[src] makes an insistent chime.</span>", 2)
update_icon()
if(bloodsamp)
var/obj/item/weapon/paper/P = new(src)
P.name = "[src] report #[++report_num]: [bloodsamp.name]"
var/obj/item/weapon/paper/P = new()
var/pname = "[src] report #[++report_num]: [bloodsamp.name]"
var/info
P.stamped = list(/obj/item/weapon/stamp)
P.overlays = list("paper_stamped")
//dna data itself
@@ -114,10 +115,10 @@
data += "\blue Blood type: [bloodsamp.dna[blood]]<br>\nDNA: [blood]<br><br>"
else
data += "No DNA found.<br>"
P.info = "<b>[src] analysis report #[report_num]</b><br>"
P.info += "<b>Scanned item:</b><br>[bloodsamp.name]<br>[bloodsamp.desc]<br><br>" + data
P.forceMove(src.loc)
P.update_icon()
info = "<b>[src] analysis report #[report_num]</b><br>"
info += "<b>Scanned item:</b><br>[bloodsamp.name]<br>[bloodsamp.desc]<br><br>" + data
P.set_content_unsafe(pname, info)
print(P)
scanning = 0
update_icon()
return

46
code/modules/detectivework/microscope/microscope.dm
View File

@@ -36,7 +36,9 @@
return
user << "<span class='notice'>Printing findings now...</span>"
var/obj/item/weapon/paper/report = new(get_turf(src))
var/obj/item/weapon/paper/report = new()
var/pname
var/info
report.stamped = list(/obj/item/weapon/stamp)
report.overlays = list("paper_stamped")
report_num++
@@ -46,48 +48,50 @@
if(slide.has_swab)
var/obj/item/weapon/forensics/swab/swab = slide.has_swab
report.name = "GSR report #[++report_num]: [swab.name]"
report.info = "<b>Scanned item:</b><br>[swab.name]<br><br>"
pname = "GSR report #[++report_num]: [swab.name]"
info = "<b>Scanned item:</b><br>[swab.name]<br><br>"
if(swab.gsr)
report.info += "Residue from a [swab.gsr] bullet detected."
info += "Residue from a [swab.gsr] bullet detected."
else
report.info += "No gunpowder residue found."
info += "No gunpowder residue found."
else if(slide.has_sample)
var/obj/item/weapon/sample/fibers/fibers = slide.has_sample
report.name = "Fiber report #[++report_num]: [fibers.name]"
report.info = "<b>Scanned item:</b><br>[fibers.name]<br><br>"
pname = "Fiber report #[++report_num]: [fibers.name]"
info = "<b>Scanned item:</b><br>[fibers.name]<br><br>"
if(fibers.evidence)
report.info = "Molecular analysis on provided sample has determined the presence of unique fiber strings.<br><br>"
info = "Molecular analysis on provided sample has determined the presence of unique fiber strings.<br><br>"
for(var/fiber in fibers.evidence)
report.info += "<span class='notice'>Most likely match for fibers: [fiber]</span><br><br>"
info += "<span class='notice'>Most likely match for fibers: [fiber]</span><br><br>"
else
report.info += "No fibers found."
info += "No fibers found."
else
report.name = "Empty slide report #[report_num]"
report.info = "Evidence suggests that there's nothing in this slide."
pname = "Empty slide report #[report_num]"
info = "Evidence suggests that there's nothing in this slide."
else if(istype(sample, /obj/item/weapon/sample/print))
report.name = "Fingerprint report #[report_num]: [sample.name]"
report.info = "<b>Fingerprint analysis report #[report_num]</b>: [sample.name]<br>"
pname = "Fingerprint report #[report_num]: [sample.name]"
info = "<b>Fingerprint analysis report #[report_num]</b>: [sample.name]<br>"
var/obj/item/weapon/sample/print/card = sample
if(card.evidence && card.evidence.len)
report.info += "Surface analysis has determined unique fingerprint strings:<br><br>"
info += "Surface analysis has determined unique fingerprint strings:<br><br>"
for(var/prints in card.evidence)
report.info += "<span class='notice'>Fingerprint string: </span>"
info += "<span class='notice'>Fingerprint string: </span>"
if(!is_complete_print(prints))
report.info += "INCOMPLETE PRINT"
info += "INCOMPLETE PRINT"
else
report.info += "[prints]"
report.info += "<br>"
info += "[prints]"
info += "<br>"
else
report.info += "No information available."
info += "No information available."
report.set_content_unsafe(pname, info)
if(report)
report.update_icon()
if(report.info)
user << report.info
return
print(report)
/obj/machinery/microscope/proc/remove_sample(var/mob/living/remover)
if(!istype(remover) || remover.incapacitated() || !Adjacent(remover))