Merge pull request #1160 from Mark9013100/3/11/2016nomoreslides

Removes the need for slides in forensics

code/modules/detectivework/microscope/microscope.dm

@@ -16,7 +16,7 @@
 		user << "<span class='warning'>There is already a slide in the microscope.</span>"
 		return
 
-	if(istype(W, /obj/item/weapon/forensics/slide) || istype(W, /obj/item/weapon/sample/print))
+	if(istype(W, /obj/item/weapon/forensics/swab)|| istype(W, /obj/item/weapon/sample/fibers) || istype(W, /obj/item/weapon/sample/print))
 		user << "<span class='notice'>You insert \the [W] into the microscope.</span>"
 		user.unEquip(W)
 		W.forceMove(src)
@@ -33,6 +33,7 @@
 	user << "<span class='notice'>The microscope whirrs as you examine \the [sample].</span>"
 
 	if(!do_after(user, 25) || !sample)
+		user << "<span class='notice'>You stop examining \the [sample].</span>"
 		return
 
 	user << "<span class='notice'>Printing findings now...</span>"
@@ -41,32 +42,27 @@
 	report.overlays = list("paper_stamped")
 	report_num++
 
-	if(istype(sample, /obj/item/weapon/forensics/slide))
-		var/obj/item/weapon/forensics/slide/slide = sample
-		if(slide.has_swab)
-			var/obj/item/weapon/forensics/swab/swab = slide.has_swab
+	if(istype(sample, /obj/item/weapon/forensics/swab))
+		var/obj/item/weapon/forensics/swab/swab = sample
 
-			report.name = "GSR report #[++report_num]: [swab.name]"
-			report.info = "<b>Scanned item:</b><br>[swab.name]<br><br>"
+		report.name = "GSR report #[++report_num]: [swab.name]"
+		report.info = "<b>Scanned item:</b><br>[swab.name]<br><br>"
 
-			if(swab.gsr)
-				report.info += "Residue from a [swab.gsr] bullet detected."
-			else
-				report.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>"
-			if(fibers.evidence)
-				report.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>"
-			else
-				report.info += "No fibers found."
+		if(swab.gsr)
+			report.info += "Residue from a [swab.gsr] bullet detected."
 		else
-			report.name = "Empty slide report #[report_num]"
-			report.info = "Evidence suggests that there's nothing in this slide."
+			report.info += "No gunpowder residue found."
+
+	else if(istype(sample, /obj/item/weapon/sample/fibers))
+		var/obj/item/weapon/sample/fibers/fibers = sample
+		report.name = "Fiber report #[++report_num]: [fibers.name]"
+		report.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>"
+			for(var/fiber in fibers.evidence)
+				report.info += "<span class='notice'>Most likely match for fibers: [fiber]</span><br><br>"
+		else
+			report.info += "No fibers found."
 	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>"

code/modules/detectivework/microscope/slides.dm

@@ -1,42 +0,0 @@
-/obj/item/weapon/forensics/slide
-	name = "microscope slide"
-	desc = "A pair of thin glass panes used in the examination of samples beneath a microscope."
-	icon_state = "slide"
-	var/obj/item/weapon/forensics/swab/has_swab
-	var/obj/item/weapon/sample/fibers/has_sample
-
-/obj/item/weapon/forensics/slide/attackby(var/obj/item/weapon/W, var/mob/user)
-	if(has_swab || has_sample)
-		user << "<span class='warning'>There is already a sample in the slide.</span>"
-		return
-	if(istype (W, /obj/item/weapon/forensics/swab))
-		has_swab = W
-	else if(istype(W, /obj/item/weapon/sample/fibers))
-		has_sample = W
-	else
-		user << "<span class='warning'>You don't think this will fit.</span>"
-		return
-	user << "<span class='notice'>You insert the sample into the slide.</span>"
-	user.unEquip(W)
-	W.forceMove(src)
-	update_icon()
-
-/obj/item/weapon/forensics/slide/attack_self(var/mob/user)
-	if(has_swab || has_sample)
-		user << "<span class='notice'>You remove \the sample from \the [src].</span>"
-		if(has_swab)
-			has_swab.loc = get_turf(src)
-			has_swab = null
-		if(has_sample)
-			has_sample.forceMove(get_turf(src))
-			has_sample = null
-		update_icon()
-		return
-
-/obj/item/weapon/forensics/slide/update_icon()
-	if(!has_swab && !has_sample)
-		icon_state = "slide"
-	else if(has_swab)
-		icon_state = "slideswab"
-	else if(has_sample)
-		icon_state = "slidefiber"

code/modules/detectivework/tools/storage.dm

@@ -11,16 +11,6 @@
 	for(var/i=0;i<storage_slots,i++) // Fill 'er up.
 		new /obj/item/weapon/forensics/swab(src)
 
-/obj/item/weapon/storage/box/slides
-	name = "microscope slide box"
-	icon_state = "solution_trays"
-	storage_slots = 7
-
-/obj/item/weapon/storage/box/slides/New()
-	..()
-	for(var/i=0;i<storage_slots,i++)
-		new /obj/item/weapon/forensics/slide(src)
-
 /obj/item/weapon/storage/box/evidence
 	name = "evidence bag box"
 	desc = "A box claiming to contain evidence bags."

code/modules/detectivework/tools/swabs.dm

@@ -68,7 +68,7 @@
 
 /obj/item/weapon/forensics/swab/afterattack(var/atom/A, var/mob/user, var/proximity)
 
-	if(!proximity || istype(A, /obj/item/weapon/forensics/slide) || istype(A, /obj/machinery/dnaforensics))
+	if(!proximity || istype(A, /obj/machinery/dnaforensics))
 		return
 
 	if(is_used())