Some investigator tweaks & minor sec mapping (#11564)

code/modules/detectivework/microscope/dnascanner.dm

@@ -103,7 +103,7 @@
 	update_icon()
 	if(bloodsamp)
 		var/obj/item/paper/P = new()
-		var/pname = "[src] report #[++report_num]: [bloodsamp.name]"
+		var/pname = "[src] report #[++report_num]"
 		var/info
 		P.stamped = list(/obj/item/stamp)
 		P.overlays = list("paper_stamped")

code/modules/detectivework/microscope/microscope.dm

@@ -48,7 +48,7 @@
 		if(slide.has_swab)
 			var/obj/item/forensics/swab/swab = slide.has_swab
 
-			pname = "GSR report #[++report_num]: [swab.name]"
+			pname = "GSR report #[report_num]"
 			info = "<b>Scanned item:</b><br>[swab.name]<br><br>"
 
 			if(swab.gsr)
@@ -58,10 +58,10 @@
 
 		else if(slide.has_sample)
 			var/obj/item/sample/fibers/fibers = slide.has_sample
-			pname = "Fiber report #[++report_num]: [initial(fibers.name)]"
+			pname = "Fiber report #[report_num]"
 			info = "<b>Scanned item:</b><br>[initial(fibers.name)]<br><br>"
 			if(fibers.evidence)
-				info = "Molecular analysis on provided sample has determined the presence of unique fiber strings.<br><br>"
+				info = "Molecular analysis on [fibers.name] has determined the presence of unique fiber strings.<br><br>"
 				for(var/fiber in fibers.evidence)
 					info += "<span class='notice'>Most likely match for fibers: [fiber]</span><br><br>"
 			else
@@ -70,7 +70,7 @@
 			pname = "Empty slide report #[report_num]"
 			info = "Evidence suggests that there's nothing in this slide."
 	else if(istype(sample, /obj/item/sample/print))
-		pname = "Fingerprint report #[report_num]: [sample.name]"
+		pname = "Fingerprint report #[report_num]"
 		info = "<b>Fingerprint analysis report #[report_num]</b>: [sample.name]<br>"
 		var/obj/item/sample/print/card = sample
 		if(card.evidence && card.evidence.len)

code/modules/detectivework/tools/evidencebag.dm

@@ -8,6 +8,12 @@
 	item_state = ""
 	w_class = ITEMSIZE_SMALL
 	var/obj/item/stored_item = null
+	var/label_text = ""
+	var/base_name = ""
+
+/obj/item/evidencebag/Initialize()
+	. = ..()
+	base_name = name
 
 /obj/item/evidencebag/MouseDrop(var/obj/item/I as obj)
 	if (!ishuman(usr))
@@ -92,3 +98,21 @@
 /obj/item/evidencebag/examine(mob/user)
 	..(user)
 	if (stored_item) user.examinate(stored_item)
+
+/obj/item/evidencebag/attackby(obj/item/W as obj, mob/user as mob)
+	if(W.ispen() || istype(W, /obj/item/device/flashlight/pen))
+		var/tmp_label = sanitizeSafe(input(user, "Enter a label for [name]", "Label", label_text), MAX_NAME_LEN)
+		if(length(tmp_label) > 15)
+			to_chat(user, "<span class='notice'>The label can be at most 15 characters long.</span>")
+		else
+			to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
+			label_text = tmp_label
+			update_name_label()
+		return
+	. = ..() 
+
+/obj/item/evidencebag/proc/update_name_label()
+	if(label_text == "")
+		name = base_name
+	else
+		name = "[base_name] ([label_text])"

code/modules/paperwork/handlabeler.dm

@@ -31,6 +31,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler0"
 	item_state = "labeler0"
+	w_class = ITEMSIZE_SMALL
 	var/label = null
 	var/labels_left = 30
 	var/mode = 0	//off or on.

code/modules/reagents/reagent_containers/glass.dm

@@ -43,10 +43,13 @@
 /obj/item/reagent_containers/glass/get_additional_forensics_swab_info()
 	var/list/additional_evidence = ..()
 	var/list/Bdata = REAGENT_DATA(reagents, /decl/reagent/blood/)
+	var/list/blood_Data = list(
+		Bdata["blood_DNA"] = Bdata["blood_type"]
+	)
 	if(Bdata)
 		additional_evidence["type"] = EVIDENCE_TYPE_BLOOD
 		additional_evidence["sample_type"] = "blood"
-		additional_evidence["dna"] += Bdata["blood_DNA"]
+		additional_evidence["dna"] += blood_Data
 		additional_evidence["sample_message"] = "You dip the swab inside [src] to sample its contents."
 
 	return additional_evidence