Refactors Electrocution and Tesla Zapping (#15357)

* 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
+1 -1
View File
@@ -168,7 +168,7 @@
/obj/effect/anomaly/flux/proc/mobShock(mob/living/M)
if(canshock && istype(M))
canshock = FALSE //Just so you don't instakill yourself if you slam into the anomaly five times in a second.
M.electrocute_act(shockdamage, "[name]", safety = TRUE)
M.electrocute_act(shockdamage, name, flags = SHOCK_NOGLOVES)
/obj/effect/anomaly/flux/detonate()
if(explosive)
-3
View File
@@ -69,9 +69,6 @@
/obj/effect/abstract/decompile_act(obj/item/matter_decompiler/C, mob/user)
return
/obj/effect/abstract/tesla_act(power)
return
/obj/effect/abstract/singularity_act()
return