From cb36f4ad240d170a827112d215c0645320bbc848 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 10 Sep 2020 22:50:17 +0100 Subject: [PATCH] travis we're friends right --- code/modules/mob/living/carbon/human/human_defense.dm | 5 ++--- code/modules/spells/spell_types/emplosion.dm | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 14c595ac8c..ecaa5e16c3 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -412,9 +412,8 @@ if(!informed) to_chat(src, "You feel a sharp pain as your robotic limbs overload.") 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() diff --git a/code/modules/spells/spell_types/emplosion.dm b/code/modules/spells/spell_types/emplosion.dm index 9958aeabe4..91706d843e 100644 --- a/code/modules/spells/spell_types/emplosion.dm +++ b/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