one

code/game/objects/items/cards_ids.dm

@@ -93,8 +93,9 @@
 /obj/item/card/emag/afterattack(atom/target, mob/user, proximity)
 	. = ..()
 	var/atom/A = target
-	if(!proximity && prox_check)
+	if(!proximity && prox_check || !(isobj(A) || issilicon(A) || isbot(A) || isdrone(A)))
 		return
+
 	//Citadel changes: modular code misfiring, so we're bypassing into main code.
 	if(!uses)
 		user.visible_message("<span class='warning'>[src] emits a weak spark. It's burnt out!</span>")
@@ -103,24 +104,22 @@
 	else if(uses <= 3)
 		playsound(src, 'sound/effects/light_flicker.ogg', 30, 1)	//Tiiiiiiny warning sound to let ya know your emag's almost dead
 
-	if(isturf(A))
-		return
 	if(istype(A,/obj/item/storage/lockbox))
-		A.emag_act(user)
+		if(!A.emag_act(user))
+			return
 		uses = max(uses - 1, 0)
 		if(!uses)
 			user.visible_message("<span class='warning'>[src] fizzles and sparks. It seems like it's out of charges.</span>")
 			playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)
+		return
 	if(istype(A,/obj/item/storage))
 		return
-	if(!(isobj(A) || issilicon(A) || isbot(A) || isdrone(A)))
+	if(!A.emag_act(user))
 		return
-	else
-		A.emag_act(user)
-		uses = max(uses - 1, 0)
-		if(!uses)
-			user.visible_message("<span class='warning'>[src] fizzles and sparks. It seems like it's out of charges.</span>")
-			playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)
+	uses = max(uses - 1, 0)
+	if(!uses)
+		user.visible_message("<span class='warning'>[src] fizzles and sparks. It seems like it's out of charges.</span>")
+		playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)
 
 
 /obj/item/card/emagfake