From a3c6571cfdda6d5ce0a593cf793ee753d432eaf9 Mon Sep 17 00:00:00 2001
From: Iamgoofball <iamgoofball@gmail.com>
Date: Fri, 3 Jun 2016 12:48:32 -0700
Subject: [PATCH] Fixes #18167 (#18170)

---
 code/modules/mining/equipment_locker.dm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 2dd5cc77147..7c8c9cfb5c7 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -95,17 +95,6 @@
 						i++
 
 /obj/machinery/mineral/ore_redemption/attackby(obj/item/weapon/W, mob/user, params)
-	if (!powered())
-		return
-	if(istype(W,/obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/I = user.get_active_hand()
-		if(istype(I) && !istype(inserted_id))
-			if(!user.drop_item())
-				return
-			I.loc = src
-			inserted_id = I
-			interact(user)
-		return
 	if(exchange_parts(user, W))
 		return
 
@@ -120,6 +109,17 @@
 	if(default_deconstruction_crowbar(W))
 		return
 
+	if (!powered())
+		return
+	if(istype(W,/obj/item/weapon/card/id))
+		var/obj/item/weapon/card/id/I = user.get_active_hand()
+		if(istype(I) && !istype(inserted_id))
+			if(!user.drop_item())
+				return
+			I.loc = src
+			inserted_id = I
+			interact(user)
+		return
 	return ..()
 
 /obj/machinery/mineral/ore_redemption/deconstruction()