cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switches out the three billion args of electrocute act for flags (#46564)

Browse Source 
* Switches out the three billion args of electrocute act for flags

* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file

* tries to fix ed209 again

* Fixes 209 hopefully

* Finally fixes that darn file

* one final one to fix the diff

* Or i guess i'll just do it myself
This commit is contained in:
nemvar
2019-10-02 23:14:19 +02:00
committed by AnturK
parent 68af9098e9
commit daffaefb71
28 changed files with 61 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/holosign.dm
+2 -2
View File
@@ -168,7 +168,7 @@
if(!shockcd)
if(ismob(user))
var/mob/living/M = user
M.electrocute_act(15,"Energy Barrier", safety=1)
M.electrocute_act(15,"Energy Barrier", flags = SHOCK_NOGLOVES)
shockcd = TRUE
addtimer(CALLBACK(src, .proc/cooldown), 5)
@@ -180,6 +180,6 @@
return
var/mob/living/M = AM
M.electrocute_act(15,"Energy Barrier", safety=1)
M.electrocute_act(15,"Energy Barrier", flags = SHOCK_NOGLOVES)
shockcd = TRUE
addtimer(CALLBACK(src, .proc/cooldown), 5)
code/game/objects/structures/traps.dm
+1 -1
View File
@@ -89,7 +89,7 @@
var/stun_time = 100
/obj/structure/trap/stun/trap_effect(mob/living/L)
L.electrocute_act(30, src, safety=1) // electrocute act does a message.
L.electrocute_act(30, src, flags = SHOCK_NOGLOVES) // electrocute act does a message.
L.Paralyze(stun_time)
/obj/structure/trap/stun/hunter