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

* sdfasf

* sdfas

* dsf

code/modules/organs/organ.dm

@@ -388,7 +388,9 @@
 			name = "mechanically assisted [initial(name)]"
 	icon_state = initial(icon_state)
 
-/obj/item/organ/emp_act(var/severity)
+/obj/item/organ/emp_act(severity)
+	. = ..()
+
 	if(!(status & ORGAN_ASSISTED))
 		return
 
@@ -398,12 +400,10 @@
 		organ_fragility = 1
 
 	switch (severity)
-		if (1.0)
+		if (EMP_HEAVY)
 			take_surge_damage(15 * emp_coeff * organ_fragility)
-		if (2.0)
+		if (EMP_LIGHT)
 			take_surge_damage(8 * emp_coeff * organ_fragility)
-		if(3.0)
-			take_surge_damage(4 * emp_coeff * organ_fragility)
 
 	return TRUE
 

code/modules/organs/subtypes/augment.dm

@@ -311,10 +311,12 @@
 		return
 
 /obj/item/organ/internal/augment/eye_sensors/emp_act(severity)
-	..()
+	. = ..()
+
 	var/obj/item/organ/internal/eyes/E = owner.get_eyes()
 	if(!E)
 		return
+
 	E.take_damage(5)
 
 /obj/item/organ/internal/augment/eye_sensors/proc/check_hud(var/hud)
@@ -453,9 +455,11 @@
 
 /obj/item/organ/internal/augment/language/emp_act()
 	. = ..()
+
 	for(var/language in added_languages)
 		if(prob(25))
 			owner.remove_language(language)
+
 	owner.set_default_language(pick(owner.languages))
 
 /obj/item/organ/internal/augment/language/klax
@@ -582,7 +586,8 @@
 	return TRUE
 
 /obj/item/organ/internal/augment/memory_inhibitor/emp_act(severity)
-	..()
+	. = ..()
+
 	if(prob(25))
 		do_broken_act()
 
@@ -658,10 +663,12 @@
 	owner.visible_message(zoom ? "<b>[owner]</b>'s pupils narrow..." : "<b>[owner]</b>'s pupils return to normal.", range = 3)
 
 /obj/item/organ/internal/augment/enhanced_vision/emp_act(severity)
-	..()
+	. = ..()
+
 	var/obj/item/organ/internal/eyes/E = owner.get_eyes()
 	if(!E)
 		return
+
 	E.take_damage(5)
 
 /obj/item/organ/internal/augment/sightlights

code/modules/organs/subtypes/autakh.dm

@@ -92,7 +92,8 @@
 			suffered_revelation = TRUE
 
 /obj/item/organ/internal/anchor/emp_act(severity)
-	..()
+	. = ..()
+
 	revelation()
 
 /obj/item/organ/internal/anchor/proc/revelation()
@@ -225,7 +226,8 @@
 	warning_level = 0
 
 /obj/item/organ/internal/augment/eye_flashlight/emp_act(severity)
-	..()
+	. = ..()
+
 	turn_off()
 
 /obj/item/organ/internal/augment/eye_flashlight/proc/add_warning()

code/modules/organs/subtypes/machine.dm

@@ -111,7 +111,8 @@
 	return servo_cost
 
 /obj/item/organ/internal/cell/emp_act(severity)
-	..()
+	. = ..()
+
 	if(cell)
 		cell.emp_act(severity)