travis we're friends right

code/modules/mob/living/carbon/human/human_defense.dm

@@ -412,9 +412,8 @@
 			if(!informed)
 				to_chat(src, "<span class='userdanger'>You feel a sharp pain as your robotic limbs overload.</span>")
 				informed = TRUE
-			if(1)
-				L.receive_damage(0,severity/10)
-				Stun(severity*2)
+			L.receive_damage(0,severity/10)
+			Stun(severity*2)
 
 /mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit)
 	var/list/damaged = list()

code/modules/spells/spell_types/emplosion.dm

@@ -3,7 +3,7 @@
 	desc = "This spell emplodes an area."
 	charge_max	= 250
 	cooldown_min = 50
-	var/range = 4 //same as a 50/50 reaction of uranium and iron
+	var/emp_range = 4 //same as a 50/50 reaction of uranium and iron
 
 	action_icon_state = "emp"
 	sound = 'sound/weapons/zapbang.ogg'
@@ -13,6 +13,6 @@
 	for(var/mob/living/target in targets)
 		if(target.anti_magic_check())
 			continue
-		empulse_using_range(target.loc, range)
+		empulse_using_range(target.loc, emp_range)
 
 	return