From a7865bd9cf8de118f41508792b5cdf7e169f07a2 Mon Sep 17 00:00:00 2001 From: Martijn Daniels Date: Tue, 29 Dec 2015 13:36:16 +0100 Subject: [PATCH] electrocute_act Changes containment field and electric chair effects to use electrocute_act --- code/game/objects/structures/electricchair.dm | 5 +++-- code/modules/power/singularity/containment_field.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index b1802b6f7a6..31c62717acf 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -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 << "You feel a deep shock course through your body!" sleep(1) - buckled_mob.burn_skin(85) + buckled_mob.electrocute_act(85, src, 1, tesla_shock = 0) visible_message("The electric chair went off!", "You hear a deep sharp shock!") A.power_light = light diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index cc65f704968..98db9a43592 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -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("[user.name] was shocked by the [src.name]!", \ "You feel a powerful shock course through your body, sending you flying!", \ "You hear a heavy electrical crack.")