CSI Eridani: Detective content update

code/game/jobs/job/security_jobs.dm

@@ -164,7 +164,6 @@
 	pda = /obj/item/pda/detective
 	backpack_contents = list(
 		/obj/item/storage/box/evidence = 1,
-		/obj/item/detective_scanner = 1,
 		/obj/item/melee/classic_baton/telescopic = 1
 	)
 

code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm

@@ -194,7 +194,6 @@
 	new /obj/item/storage/box/evidence(src)
 	new /obj/item/clipboard(src)
 	new /obj/item/radio/headset/headset_sec/alt(src)
-	new /obj/item/detective_scanner(src)
 	new /obj/item/ammo_box/magazine/detective/speedcharger(src)
 	new /obj/item/ammo_box/magazine/detective/speedcharger(src)
 	new /obj/effect/spawner/detgun(src)

code/modules/clothing/clothing.dm

@@ -43,6 +43,7 @@
 
 	/// Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default
 	var/can_leave_fibers = TRUE
+	var/gunshot_residue
 
 /obj/item/clothing/update_icon_state()
 	if(!can_toggle)

code/modules/detective_work/evidence.dm

@@ -80,3 +80,177 @@
 	else
 		to_chat(user, "[src] is empty.")
 		icon_state = "evidenceobj"
+
+/obj/item/forensics
+	icon = 'icons/obj/forensics/forensics.dmi'
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/sample
+	name = "\improper Forensic sample"
+	icon = 'icons/obj/forensics/forensics.dmi'
+	w_class = WEIGHT_CLASS_TINY
+	var/list/evidence = list()
+
+/obj/item/sample/New(newloc, atom/supplied)
+	..(newloc)
+	if(supplied)
+		copy_evidence(supplied)
+		name = "[initial(name)] (\the [supplied])"
+
+/obj/item/sample/print/New(newloc, atom/supplied)
+	..(newloc, supplied)
+	if(evidence && evidence.len)
+		icon_state = "fingerprint1"
+
+/obj/item/sample/proc/copy_evidence(atom/supplied)
+	if(supplied.suit_fibers && supplied.suit_fibers.len)
+		evidence = supplied.suit_fibers.Copy()
+		supplied.suit_fibers.Cut()
+
+/obj/item/sample/proc/merge_evidence(obj/item/sample/supplied, mob/user)
+	if(!supplied.evidence || !supplied.evidence.len)
+		return FALSE
+	evidence |= supplied.evidence
+	name = ("[initial(name)] (combined)")
+	to_chat(user, "<span class='notice'>You are moving \the [supplied] to \the [src].</span>")
+	return TRUE
+
+/obj/item/sample/print/merge_evidence(obj/item/sample/supplied, mob/user)
+	if(!supplied.evidence || !supplied.evidence.len)
+		return FALSE
+	for(var/print in supplied.evidence)
+		if(evidence[print])
+			evidence[print] = stringmerge(evidence[print],supplied.evidence[print])
+		else
+			evidence[print] = supplied.evidence[print]
+	name = ("[initial(name)] (combined)")
+	to_chat(user, "<span class='notice'>You overlay \the [src] and \the [supplied], combining the print records.</span>")
+	return TRUE
+
+/obj/item/sample/pre_attack(atom/A, mob/living/user, params)
+	. = ..()
+	// Fingerprints will be handled in after_attack() to not mess up the samples taken
+	return A.attackby(src, user, params)
+
+/obj/item/sample/attackby(obj/O, mob/user)
+	if(O.type == src.type)
+		user.unEquip(O)
+		if(merge_evidence(O, user))
+			qdel(O)
+		return TRUE
+	return ..()
+
+/obj/item/sample/fibers
+	name = "\improper fiber bag"
+	desc = "Used to store fiber evidence for forensic examination."
+	icon_state = "fiberbag"
+
+/obj/item/sample/print
+	name = "\improper fingerprint card"
+	desc = "Preserves fingerprints."
+	icon = 'icons/obj/card.dmi'
+	icon_state = "fingerprint0"
+	item_state = "paper"
+
+/obj/item/sample/print/attack_self(mob/user)
+	if(evidence && evidence.len)
+		return
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+	if(H.gloves)
+		to_chat(user, "<span class='warning'>Take [H.gloves] off first.</span>")
+		return
+
+	to_chat(user, "<span class='notice'>You press your fingertips firmly against the card.</span>")
+	var/fullprint = H.get_full_print()
+	evidence[fullprint] = fullprint
+	name = ("[initial(name)] ([H])")
+	icon_state = "fingerprint1"
+
+/obj/item/sample/print/attack(mob/living/M, mob/user)
+
+	if(!ishuman(M))
+		return ..()
+
+	if(evidence && evidence.len)
+		return FALSE
+
+	var/mob/living/carbon/human/H = M
+
+	if(H.gloves)
+		to_chat(user, "<span class='warning'>[H] is wearing gloves.</span>")
+		return TRUE
+
+	if(user != H && H.a_intent != INTENT_HELP && !IS_HORIZONTAL(H))
+		user.visible_message("<span class='danger'>[user] tried to fingerprint [H], but he resists.</span>")
+		return TRUE
+
+	if(user.zone_selected == "r_hand" || user.zone_selected == "l_hand")
+		var/has_hand
+		var/obj/item/organ/external/O = H.has_organ("r_hand")
+		if(istype(O))
+			has_hand = TRUE
+		else
+			O = H.has_organ("l_hand")
+			if(istype(O))
+				has_hand = TRUE
+		if(!has_hand)
+			to_chat(user, "<span class='warning'>But [H] has no hands.</span>")
+			return FALSE
+		if(!do_after(user, 2 SECONDS, target = user))
+			return FALSE
+
+		user.visible_message("<span class='notice'>[user] makes a copy of [H]'s fingerprints'.</span>")
+		var/fullprint = H.get_full_print()
+		evidence[fullprint] = fullprint
+		copy_evidence(src)
+		name = ("[initial(name)] (\the [H])")
+		icon_state = "fingerprint1"
+		return TRUE
+	return FALSE
+
+/obj/item/sample/print/copy_evidence(atom/supplied)
+	if(supplied.fingerprints && supplied.fingerprints.len)
+		for(var/print in supplied.fingerprints)
+			evidence[print] = supplied.fingerprints[print]
+		supplied.fingerprints.Cut()
+
+/obj/item/forensics/sample_kit
+	name = "\improper fiber collection kit"
+	desc = "Magnifying glass and tweezers. Used to lift fabric fibers."
+	icon_state = "m_glass"
+	w_class = WEIGHT_CLASS_SMALL
+	var/evidence_type = "fibers"
+	var/evidence_path = /obj/item/sample/fibers
+
+/obj/item/forensics/sample_kit/proc/can_take_sample(mob/user, atom/supplied)
+	return (supplied.suit_fibers && supplied.suit_fibers.len)
+
+/obj/item/forensics/sample_kit/proc/take_sample(mob/user, atom/supplied)
+	var/obj/item/sample/S = new evidence_path(get_turf(user), supplied)
+	to_chat(user, "<span class='notice'>You move [S.evidence.len] [S.evidence.len > 1 ? "[evidence_type]" : "[evidence_type]"] в \the [S].</span>")
+
+/obj/item/forensics/sample_kit/afterattack(atom/A, mob/user, proximity)
+	if(!proximity)
+		return
+	if(can_take_sample(user, A))
+		take_sample(user,A)
+		. = TRUE
+	else
+		to_chat(user, "<span class='warning'>You cannot find [evidence_type] on [A].</span>")
+		. = ..()
+
+/obj/item/forensics/sample_kit/MouseDrop(atom/over)
+	if(ismob(src.loc))
+		afterattack(over, usr, TRUE)
+
+/obj/item/forensics/sample_kit/powder
+	name = "\improper Fingerprint Powder"
+	desc = "A jar of aluminum powder and a specialized brush."
+	icon_state = "dust"
+	evidence_type = "prints"
+	evidence_path = /obj/item/sample/print
+
+/obj/item/forensics/sample_kit/powder/can_take_sample(mob/user, atom/supplied)
+	return (supplied.fingerprints && supplied.fingerprints.len)

code/modules/detective_work/forensic_kits.dm

@@ -0,0 +1,68 @@
+// Boxes
+/obj/item/storage/box/swabs
+	name = "\improper Box of Forensic Swabs"
+	desc = "Sterile equipment inside. Avoid contamination."
+	icon = 'icons/obj/boxes.dmi'
+	icon_state = "sec_box"
+
+/obj/item/storage/box/swabs/populate_contents()
+	..()
+	new /obj/item/forensics/swab(src)
+	new /obj/item/forensics/swab(src)
+	new /obj/item/forensics/swab(src)
+	new /obj/item/forensics/swab(src)
+	new /obj/item/forensics/swab(src)
+	new /obj/item/forensics/swab(src)
+
+/obj/item/storage/box/fingerprints
+	name = "\improper Box of Fingerprint Cards"
+	desc = "Sterile equipment inside. Avoid contamination."
+	icon = 'icons/obj/boxes.dmi'
+	icon_state = "id_prisoner_box"
+
+/obj/item/storage/box/fingerprints/populate_contents()
+	..()
+	new /obj/item/sample/print(src)
+	new /obj/item/sample/print(src)
+	new /obj/item/sample/print(src)
+	new /obj/item/sample/print(src)
+	new /obj/item/sample/print(src)
+	new /obj/item/sample/print(src)
+
+// Crime scene kit
+/obj/item/storage/briefcase/crimekit
+	name = "\improper Crime Scene Kit"
+	desc = "Stainless steel coated case containing everything a detective could need. Feels heavy."
+	icon = 'icons/obj/forensics/forensics.dmi'
+	icon_state = "case"
+	lefthand_file = 'icons/obj/forensics/items_lefthand.dmi'
+	righthand_file = 'icons/obj/forensics/items_righthand.dmi'
+	item_state = "case"
+
+/obj/item/storage/briefcase/crimekit/populate_contents()
+	..()
+	new /obj/item/storage/box/swabs(src)
+	new /obj/item/storage/box/fingerprints(src)
+	new /obj/item/forensics/sample_kit(src)
+	new /obj/item/forensics/sample_kit/powder(src)
+	new /obj/item/storage/csi_markers(src)
+
+/obj/structure/closet/secure_closet/detective/populate_contents()
+	new /obj/item/storage/briefcase/crimekit(src)
+	. = ..()
+
+/obj/item/storage/csi_markers
+	name = "crime scene markers box"
+	desc = "A cardboard box for crime scene marker cards."
+	icon = 'icons/obj/boxes.dmi'
+	icon_state = "sec_box"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/storage/csi_markers/populate_contents()
+	new /obj/item/csi_marker/n1(src)
+	new /obj/item/csi_marker/n2(src)
+	new /obj/item/csi_marker/n3(src)
+	new /obj/item/csi_marker/n4(src)
+	new /obj/item/csi_marker/n5(src)
+	new /obj/item/csi_marker/n6(src)
+	new /obj/item/csi_marker/n7(src)