From 66271e7a9115f2f4216166a0071d3e593d4e1697 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 16 Mar 2020 21:36:54 -0700 Subject: [PATCH 1/2] Merge pull request #6825 from Jamini/Jamini-patch-1 Shock modification --- code/modules/mob/living/carbon/carbon.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e823e036c25..ddfca59db9f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -105,7 +105,11 @@ if (shock_damage<1) return 0 - src.apply_damage(shock_damage, BURN, def_zone, used_weapon="Electrocution") + src.apply_damage(0.2 * shock_damage, BURN, def_zone, used_weapon="Electrocution") //shock the target organ + src.apply_damage(0.4 * shock_damage, BURN, BP_TORSO, used_weapon="Electrocution") //shock the torso more + src.apply_damage(0.2 * shock_damage, BURN, null, used_weapon="Electrocution") //shock a random part! + src.apply_damage(0.2 * shock_damage, BURN, null, used_weapon="Electrocution") //shock a random part! + playsound(loc, "sparks", 50, 1, -1) if (shock_damage > 15) src.visible_message(