shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update emplosion.dm

Browse Source
This commit is contained in:
deathride58
2018-02-25 16:39:16 -05:00
committed by GitHub
parent 493623c827
commit bee0f1a366
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/spells/spell_types/emplosion.dm
View File

@@ -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
return