From bee0f1a36684e13a313ba91c765ac2fc51c4e370 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 25 Feb 2018 16:39:16 -0500 Subject: [PATCH] Update emplosion.dm --- code/modules/spells/spell_types/emplosion.dm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/code/modules/spells/spell_types/emplosion.dm b/code/modules/spells/spell_types/emplosion.dm index 859bc797c3..e6393e8584 100644 --- a/code/modules/spells/spell_types/emplosion.dm +++ b/code/modules/spells/spell_types/emplosion.dm @@ -1,20 +1,3 @@ -<<<<<<< HEAD -/obj/effect/proc_holder/spell/targeted/emplosion - name = "Emplosion" - desc = "This spell emplodes an area." - - var/emp_heavy = 2 - var/emp_light = 3 - - action_icon_state = "emp" - sound = 'sound/weapons/zapbang.ogg' - -/obj/effect/proc_holder/spell/targeted/emplosion/cast(list/targets,mob/user = usr) - playsound(get_turf(user), sound, 50,1) - for(var/mob/living/target in targets) - empulse(target.loc, emp_heavy, emp_light) - -======= /obj/effect/proc_holder/spell/targeted/emplosion name = "Emplosion" desc = "This spell emplodes an area." @@ -32,5 +15,4 @@ continue empulse(target.loc, emp_heavy, emp_light) ->>>>>>> 2ac902a... Refactors anti-magic into a component (#35639) - return \ No newline at end of file + return