diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 84b4346a79..30b1ca3399 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -95,16 +95,33 @@
 	var/atom/A = target
 	if(!proximity && prox_check)
 		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>")
+		playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)
+		return
+	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)
+		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)
 	if(istype(A,/obj/item/storage))
 		return
 	if(!(isobj(A) || issilicon(A) || isbot(A) || isdrone(A)))
 		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)
+
 
 /obj/item/card/emagfake
 	desc = "It's a card with a magnetic strip attached to some circuitry. Closer inspection shows that this card is a poorly made replica, with a \"DonkCo\" logo stamped on the back."
diff --git a/modular_citadel/code/game/objects/ids.dm b/modular_citadel/code/game/objects/ids.dm
index 5d67c18416..89a3c0f0c2 100644
--- a/modular_citadel/code/game/objects/ids.dm
+++ b/modular_citadel/code/game/objects/ids.dm
@@ -81,16 +81,3 @@
 			to_chat(user, "<span class='warning'>[ER] has no charges left.</span>")
 		return
 	. = ..()
-
-/obj/item/card/emag/afterattack(atom/target, mob/user, proximity)
-	if(!uses)
-		user.visible_message("<span class='warning'>[src] emits a weak spark. It's burnt out!</span>")
-		playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)
-		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)
-	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