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

electrocute_act

Browse Source 
Changes containment field and electric chair effects to use
electrocute_act
This commit is contained in:
Martijn Daniels
2015-12-29 13:36:16 +01:00
parent d3d582f0cb
commit a7865bd9cf
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/electricchair.dm
+3 -2
View File
@@ -48,10 +48,11 @@
s.set_up(12, 1, src)
s.start()
if(buckled_mob)
buckled_mob.burn_skin(85)
//buckled_mob.burn_skin(85)
buckled_mob.electrocute_act(85, src, 1, tesla_shock = 0)
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, tesla_shock = 0)
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
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, tesla_shock = 0)
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>")