EMP Refactor & Multi Z-level EMPs (#17781)

* sdfasf

* sdfas

* dsf

code/game/objects/items/devices/auto_cpr.dm

@@ -252,6 +252,8 @@
 	..()
 
 /obj/item/auto_cpr/emp_act(severity)
+	. = ..()
+
 	epp_off()
 	cpr_mode = FALSE
 	if(battery)

code/game/objects/items/devices/flash.dm

@@ -152,12 +152,13 @@
 			L.disable_cloaking_device()
 
 /obj/item/device/flash/emp_act(severity)
+	. = ..()
+
 	var/mob/living/L = loc
 	if(!istype(L) || broken || burnout_check(L, intensity = 15 / severity))
 		return
 	to_chat(L, SPAN_WARNING("Your [src] goes off!"))
 	flash(L)
-	..()
 
 /obj/item/device/flash/synthetic
 	name = "synthetic flash"

code/game/objects/items/devices/laserpointer.dm

@@ -87,7 +87,7 @@
 		var/obj/machinery/camera/C = target
 
 		if(prob(25))
-			C.emp_act(28)
+			C.emp_act(EMP_LIGHT)
 			selfmsg = "<span class='notice'>You hit the lens of \the [C] with \the [src], temporarily disabling the camera!</span>"
 
 			admin_attack_log(user, src,"hits the  camera with a laser pointer",  "EMPd a camera with a laser pointer")

code/game/objects/items/devices/lighting/flashlight.dm

@@ -215,9 +215,10 @@
 		update_light()
 
 /obj/item/device/flashlight/emp_act(severity)
+	. = ..()
+
 	for(var/obj/O in contents)
 		O.emp_act(severity)
-	..()
 
 /obj/item/device/flashlight/attack(mob/living/M as mob, mob/living/user as mob)
 	add_fingerprint(user)

code/game/objects/items/devices/paicard.dm

@@ -429,6 +429,8 @@
 		M.show_message(SPAN_NOTICE("\The [src] flashes a message across its screen, \"Additional personalities available for download.\""), 3, SPAN_NOTICE("\The [src] bleeps electronically."), 2)
 
 /obj/item/device/paicard/emp_act(severity)
+	. = ..()
+
 	for(var/mob/M in src)
 		M.emp_act(severity)
 

code/game/objects/items/devices/powersink.dm

@@ -171,10 +171,10 @@
 				else
 					AP.flicker_all()
 			else if (T.master)
-				T.master.emp_act(dist)
+				T.master.emp_act(EMP_LIGHT)
 
 		var/atom/aa = A
-		aa.emp_act(dist)
+		aa.emp_act(EMP_LIGHT)
 
 		if (prob(15 * dist))
 			explosion(aa.loc, 0, 0, 3, 4)

code/game/objects/items/devices/radio/beacon.dm

@@ -66,4 +66,6 @@ var/global/list/teleportbeacons = list()
 	return
 
 /obj/item/device/radio/beacon/fixed/emp_act(severity)
+	. = ..()
+
 	return

code/game/objects/items/devices/radio/radio.dm

@@ -541,11 +541,12 @@ var/global/list/default_interrogation_channels = list(
 	else return
 
 /obj/item/device/radio/emp_act(severity)
+	. = ..()
+
 	set_broadcasting(FALSE)
 	set_listening(FALSE)
 	for (var/ch_name in channels)
 		channels[ch_name] = 0
-	..()
 
 //
 // Vesselbound Synthetic Radio

code/game/objects/items/devices/radio_jammer.dm

@@ -64,7 +64,9 @@ var/list/active_radio_jammers = list()
 			update_icon()
 			. = TRUE
 
-/obj/item/device/radiojammer/emp_act()
+/obj/item/device/radiojammer/emp_act(severity)
+	. = ..()
+
 	toggle()
 
 /obj/item/device/radiojammer/proc/toggle(var/mob/user)

code/game/objects/items/devices/t_scanner.dm

@@ -29,7 +29,9 @@
 /obj/item/device/t_scanner/update_icon()
 	icon_state = "t-ray[on]"
 
-/obj/item/device/t_scanner/emp_act()
+/obj/item/device/t_scanner/emp_act(severity)
+	. = ..()
+
 	audible_message(src, SPAN_NOTICE("\The [src] buzzes oddly."))
 	set_active(FALSE)