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

Merge pull request #14144 from TheRealGLH/electric_chair

Browse Source 
Containment fields and electric chairs now use electrocute_act
This commit is contained in:
Cheridan
2015-12-31 19:01:52 -06:00
parent 3d1e20f9b1 9cb962cbc1
commit cb27e966eb
4 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/containment_field.dm
+1 -1
View File
@@ -92,7 +92,7 @@
var/stun = min(shock_damage, 15)
user.Stun(stun)
user.Weaken(10)
user.burn_skin(shock_damage)
user.electrocute_act(shock_damage, src, 1)
user.visible_message("<span class='danger'>[user.name] was shocked by the [src.name]!</span>", \
"<span class='userdanger'>You feel a powerful shock course through your body, sending you flying!</span>", \
"<span class='italics'>You hear a heavy electrical crack.</span>")