Merge branch 'emp-rework' of https://github.com/timothyteakettle/Citadel-Station-13 into emp-rework

code/game/objects/empulse.dm

@@ -5,7 +5,7 @@
 	if(!isturf(epicenter))
 		epicenter = get_turf(epicenter.loc)
 
-	var/max_distance = round((power/7)^0.7)
+	var/max_distance = max(round((power/7)^0.7), 1)
 
 	if(log)
 		message_admins("EMP with power [power], max distance [max_distance] in area [epicenter.loc.name] ")
@@ -14,9 +14,14 @@
 	if(power > 100)
 		new /obj/effect/temp_visual/emp/pulse(epicenter)
 
-	for(var/A in spiral_range(light_range, epicenter))
+	for(var/A in spiral_range(max_distance, epicenter))
 		var/atom/T = A
 		var/distance = get_dist(epicenter, T)
-		var/severity = min(max((max_distance / distance^0.3) * (100/max_distance), 1),100) //if it goes below 1 or above 100 stuff gets bad
+		var/severity = 100
+		if(distance != 0) //please dont divide by 0
+			severity = min(max((max_distance / distance^0.3) * (100/max_distance), 1),100) //if it goes below 1 or above 100 stuff gets bad
 		T.emp_act(severity)
 	return 1
+
+/proc/empulse_power_from_range(range) //work out the power required for an emp of a given wanted range
+	return (7*(range^(1/0.7)))

code/game/objects/items/granters.dm

@@ -351,7 +351,7 @@
 /obj/item/book/granter/spell/charge/recoil(mob/user)
 	..()
 	to_chat(user,"<span class='warning'>[src] suddenly feels very warm!</span>")
-	empulse(src, 1, 1)
+	empulse(src, 7)
 
 /obj/item/book/granter/spell/summonitem
 	spell = /obj/effect/proc_holder/spell/targeted/summonitem

code/game/objects/items/grenades/emgrenade.dm

@@ -7,5 +7,5 @@
 /obj/item/grenade/empgrenade/prime(mob/living/lanced_by)
 	. = ..()
 	update_mob()
-	empulse(src, 4, 10)
+	empulse(src, 400)
 	qdel(src)

code/game/objects/items/implants/implant_misc.dm

@@ -65,7 +65,7 @@
 /obj/item/implant/emp/activate()
 	. = ..()
 	uses--
-	empulse(imp_in, 3, 5)
+	empulse(imp_in, 200)
 	if(!uses)
 		qdel(src)