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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-17 22:46:43 +02:00
parent a0328e210d e377bdc2cc
commit 6faf9c769f
78 changed files with 905 additions and 595 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)