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

Refactors Electrocution and Tesla Zapping (#15357)

Browse Source 
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
This commit is contained in:
Fox McCloud
2021-02-03 20:52:03 +00:00
committed by GitHub
parent 5608f36a4b
commit 8947e97f3b
50 changed files with 598 additions and 384 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 @@
var/mob/living/current = target
if(bounces < 1)
if(damaging)
current.electrocute_act(bolt_energy, "Lightning Bolt", safety = TRUE)
current.electrocute_act(bolt_energy, "Lightning Bolt", flags = SHOCK_NOGLOVES)
else
current.AdjustJitter(1000) //High numbers for violent convulsions
current.do_jitter_animation(current.jitteriness)
@@ -99,7 +99,7 @@
playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1)
else
if(damaging)
current.electrocute_act(bolt_energy, "Lightning Bolt", safety = TRUE)
current.electrocute_act(bolt_energy, "Lightning Bolt", flags = SHOCK_NOGLOVES)
else
current.AdjustJitter(1000) //High numbers for violent convulsions
current.do_jitter_animation(current.jitteriness)