From fea1c3dd5f12e18980d5d9c1441ea7dacf815467 Mon Sep 17 00:00:00 2001
From: Sparky <ben.polwart@gmail.com>
Date: Sun, 21 Aug 2022 00:55:56 +0100
Subject: [PATCH] Fixes crime scene markers not going back in the box (#14672)

Title.
---
 code/modules/detectivework/tools/scene_cards.dm | 14 ++++++++------
 html/changelogs/forensicmarkerfix.yml           |  6 ++++++
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/forensicmarkerfix.yml

diff --git a/code/modules/detectivework/tools/scene_cards.dm b/code/modules/detectivework/tools/scene_cards.dm
index cce14821166..b1a740c0436 100644
--- a/code/modules/detectivework/tools/scene_cards.dm
+++ b/code/modules/detectivework/tools/scene_cards.dm
@@ -30,15 +30,17 @@
 	layer = ABOVE_MOB_LAYER //so you can mark bodies
 	var/number = 1
 
-/obj/item/csi_marker/afterattack(turf/H, mob/user, proximity)
+/obj/item/csi_marker/afterattack(atom/A, mob/user, proximity)
 	if(!proximity)
 		return
-	if(!user.Adjacent(H))
-		return
-	if(H.density)
-		return
+	if(!istype(A, /obj/item/storage))
+		if(!user.Adjacent(A))
+			return
+		if(A.density)
+			return
 
-	user.drop_from_inventory(src, get_turf(H))
+		user.drop_from_inventory(src, get_turf(A))
+	return
 
 /obj/item/csi_marker/Initialize(mapload)
 	. = ..()
diff --git a/html/changelogs/forensicmarkerfix.yml b/html/changelogs/forensicmarkerfix.yml
new file mode 100644
index 00000000000..963d1ba6145
--- /dev/null
+++ b/html/changelogs/forensicmarkerfix.yml
@@ -0,0 +1,6 @@
+author: Sparky_hotdog
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes crime scene markers being unable to be placed back in their box."