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."