cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11285 from Fox-McCloud/elecrocution-refactor

Browse Source 
Refactors Electrocution
This commit is contained in:
variableundefined
2019-04-16 19:47:42 +08:00
committed by GitHub
parent aacc82c937 58a7107eae
commit eb83a2dee7
31 changed files with 158 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/lightning.dm
+2 -2
View File
@@ -88,7 +88,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr)
var/mob/living/current = target
if(bounces < 1)
if(damaging)
current.electrocute_act(bolt_energy,"Lightning Bolt",safety=1)
current.electrocute_act(bolt_energy, "Lightning Bolt", safety = TRUE)
else
current.AdjustJitter(1000) //High numbers for violent convulsions
current.do_jitter_animation(current.jitteriness)
@@ -99,7 +99,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr)
playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1)
else
if(damaging)
current.electrocute_act(bolt_energy,"Lightning Bolt",safety=1)
current.electrocute_act(bolt_energy, "Lightning Bolt", safety = TRUE)
else
current.AdjustJitter(1000) //High numbers for violent convulsions
current.do_jitter_animation(current.jitteriness)