From ec61dadc502a8e8d5e0252937cccbf030b413a4e Mon Sep 17 00:00:00 2001 From: Will <7099514+Willburd@users.noreply.github.com> Date: Tue, 28 Apr 2026 15:55:37 -0400 Subject: [PATCH] boink --- code/modules/mob/living/simple_mob/defense.dm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm index bd8b91b70279..a3abbb8a611b 100644 --- a/code/modules/mob/living/simple_mob/defense.dm +++ b/code/modules/mob/living/simple_mob/defense.dm @@ -220,10 +220,22 @@ // Shot with taser/stunvolver /mob/living/simple_mob/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null, var/electric = FALSE) if(taser_kill) - var/stunDam = 0 - var/agonyDam = 0 + //var/stunDam = 0 + //var/agonyDam = 0 var/armor = run_armor_check(def_zone = null, attack_flag = "energy") + // PY edit begin - Handle simplemob taser damage as stuns with some damage. Instead of treating a high stun time as insane damage. + var/stun_divisor = 6 + var/damage_divisor = 8 + if(prob(90)) + Stun(stun_amount + rand(0, agony_amount/stun_divisor)) + if(prob(80)) + Weaken(rand(agony_amount/stun_divisor,agony_amount/(stun_divisor+1))) + if(stun_amount) + apply_damage(FLOOR( stun_amount / damage_divisor, 1), BURN, null, armor, resistance, FALSE, FALSE, used_weapon) + if(agony_amount) + apply_damage(FLOOR( agony_amount / damage_divisor, 1), BURN, null, armor, resistance, FALSE, FALSE, used_weapon) + /* if(stun_amount) stunDam += stun_amount * 0.5 apply_damage(damage = stunDam, damagetype = BURN, def_zone = null, blocked = armor, blocked = resistance, sharp = FALSE, edge = FALSE, used_weapon = used_weapon) @@ -231,6 +243,8 @@ if(agony_amount) agonyDam += agony_amount * 0.5 apply_damage(damage = agonyDam, damagetype = BURN, def_zone = null, blocked = armor, blocked = resistance, sharp = FALSE, edge = FALSE, used_weapon = used_weapon) + */ + // PY edit end // Electromagnetism