[MIRROR] EMP cleanup (#11939)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/modules/projectiles/ammunition/rounds.dm

@@ -315,7 +315,7 @@
 	projectile_type = /obj/item/projectile/energy/electrode/stunshot
 	matter = list(MAT_STEEL = 360, MAT_GLASS = 720)
 
-/obj/item/ammo_casing/a12g/stunshell/emp_act(severity)
+/obj/item/ammo_casing/a12g/stunshell/emp_act(severity, recursive)
 	if(prob(100/severity)) BB = null
 	update_icon()
 

code/modules/projectiles/ammunition/smartmag.dm

@@ -122,12 +122,6 @@
 				return
 	..()
 
-// Classic emp_act, just drains the battery
-/obj/item/ammo_magazine/smart/emp_act(severity)
-	..()
-	if(attached_cell)
-		attached_cell.emp_act(severity)
-
 // Finds the cell for the magazine, used by rechargers
 /obj/item/ammo_magazine/smart/get_cell()
 	return attached_cell

code/modules/projectiles/gun.dm

@@ -233,10 +233,6 @@
 	explosion(src, 0, 0, 3, 4)
 	QDEL_IN(src, 1)
 
-/obj/item/gun/emp_act(severity)
-	for(var/obj/O in contents)
-		O.emp_act(severity)
-
 /obj/item/gun/afterattack(atom/A, mob/living/user, adjacent, params)
 	if(adjacent) return //A is adjacent, is the user, or is on the user's person
 

code/modules/projectiles/guns/energy.dm

@@ -110,7 +110,7 @@
 	if(..())
 		update_icon()
 
-/obj/item/gun/energy/emp_act(severity)
+/obj/item/gun/energy/emp_act(severity, recursive)
 	..()
 	update_icon()
 

code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm

@@ -211,7 +211,7 @@
 	deltimer(recharge_timerid)
 	recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), recharge_time * carried, TIMER_STOPPABLE)
 
-/obj/item/gun/energy/kinetic_accelerator/emp_act(severity)
+/obj/item/gun/energy/kinetic_accelerator/emp_act(severity, recursive)
 	return
 
 /obj/item/gun/energy/kinetic_accelerator/proc/reload()

code/modules/projectiles/guns/energy/pump.dm

@@ -106,8 +106,8 @@
 		return
 	..()
 
-/obj/item/gun/energy/locked/frontier/emp_act(severity)
-	return ..(severity+2)
+/obj/item/gun/energy/locked/frontier/emp_act(severity, recursive)
+	return ..(severity+2, recursive)
 
 /obj/item/gun/energy/locked/frontier/ex_act() //|rugged|
 	return

code/modules/projectiles/guns/energy/special.dm

@@ -13,8 +13,8 @@
 	slot_flags = SLOT_BACK
 	projectile_type = /obj/item/projectile/ion
 
-/obj/item/gun/energy/ionrifle/emp_act(severity)
-	..(max(severity, 4)) //so it doesn't EMP itself, I guess
+/obj/item/gun/energy/ionrifle/emp_act(severity, recursive)
+	return
 
 /obj/item/gun/energy/ionrifle/empty
 	cell_type = null