cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +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/game/objects/structures/electricchair.dm
+2 -2
View File
@@ -48,10 +48,10 @@
s.set_up(12, 1, src)
s.start()
if(buckled_mob)
buckled_mob.burn_skin(85)
buckled_mob.electrocute_act(85, src, 1)
buckled_mob << "<span class='userdanger'>You feel a deep shock course through your body!</span>"
sleep(1)
buckled_mob.burn_skin(85)
buckled_mob.electrocute_act(85, src, 1)
visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='italics'>You hear a deep sharp shock!</span>")
A.power_light = light