Merge pull request #13375 from timothyteakettle/emp-rework

the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)

code/modules/projectiles/guns/energy.dm

@@ -41,7 +41,7 @@
 /obj/item/gun/energy/emp_act(severity)
 	. = ..()
 	if(!(. & EMP_PROTECT_CONTENTS))
-		cell.use(round(cell.charge / severity))
+		cell.use(round(cell.charge * severity/100))
 		chambered = null //we empty the chamber
 		recharge_newshot() //and try to charge a new shot
 		update_icon()

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

@@ -132,7 +132,7 @@
 	. = ..()
 	if(. & EMP_PROTECT_SELF)
 		return
-	fail_chance = min(fail_chance + round(15/severity), 100)
+	fail_chance = min(fail_chance + round(severity/6.6), 100)
 
 /obj/item/gun/energy/e_gun/nuclear/update_overlays()
 	. = ..()

code/modules/projectiles/projectile/special/ion.dm

@@ -10,7 +10,7 @@
 
 /obj/item/projectile/ion/on_hit(atom/target, blocked = FALSE)
 	..()
-	empulse(target, emp_radius, emp_radius)
+	empulse_using_range(target, emp_radius)
 	return BULLET_ACT_HIT
 
 /obj/item/projectile/ion/weak