From a41b9ccd06b9cc5f21ab0603bec93fdb33840956 Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Mon, 17 Nov 2025 20:18:37 +0100
Subject: [PATCH] Fixes crate scanners working on crates stored on the crate
 shelves (#21579)

It caused some issues when a crate scanner was used on a crate on the
crate shelves. This prevents that behavior.
---
 code/game/objects/structures/crates_lockers/closets.dm | 7 +++++--
 html/changelogs/CrateScanFix.yml                       | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/CrateScanFix.yml

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 1ce17b4204f..3b9f86e796d 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -417,10 +417,13 @@
 	else if(istype(attacking_item, /obj/item/device/cratescanner))
 		var/obj/item/device/cratescanner/Cscanner = attacking_item
 		if(locked)
-			to_chat(user, SPAN_WARNING("[attacking_item] refuses to scan [src]. Unlock it first!"))
+			to_chat(user, SPAN_WARNING("[attacking_item] refuses to scan \the [src]. Unlock it first!"))
 			return
 		if(welded)
-			to_chat(user, SPAN_WARNING("[attacking_item] detects that [src] is welded shut, and refuses to scan."))
+			to_chat(user, SPAN_WARNING("[attacking_item] detects that \the [src] is welded shut, and refuses to scan."))
+			return
+		if(istype(loc, /obj/structure/crate_shelf))
+			to_chat(user, SPAN_WARNING("[attacking_item] can't scan \the [src] while it is on \the [loc]."))
 			return
 		Cscanner.print_contents(name, contents, src.loc)
 	else if(istype(attacking_item, /obj/item/stack/packageWrap))
diff --git a/html/changelogs/CrateScanFix.yml b/html/changelogs/CrateScanFix.yml
new file mode 100644
index 00000000000..79a161d970a
--- /dev/null
+++ b/html/changelogs/CrateScanFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Crate scanners no longer work on crates on crate shelves."