From b7271c9107a323929cdcf42eae63da8464249c4f Mon Sep 17 00:00:00 2001 From: Joshua Kidder <49173900+Metekillot@users.noreply.github.com> Date: Wed, 30 Jul 2025 07:09:37 -0400 Subject: [PATCH] Fix a broken calculation in /obj/item/stock_parts/power_store/suicide_act() (#92336) --- code/modules/power/power_store.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm index 9dd60708a37..c03b5b9590c 100644 --- a/code/modules/power/power_store.dm +++ b/code/modules/power/power_store.dm @@ -267,13 +267,14 @@ return SHAME playsound(user, 'sound/effects/sparks/sparks1.ogg', charge / maxcharge) var/damage = charge / (1 KILO JOULES) + var/discharged_energy = charge user.electrocute_act(damage, src, 1, SHOCK_IGNORE_IMMUNITY|SHOCK_DELAY_STUN|SHOCK_NOGLOVES) charge = 0 update_appearance() if(user.stat != DEAD) to_chat(user, span_suicide("There's not enough charge in [src] to kill you!")) return SHAME - addtimer(CALLBACK(src, PROC_REF(gib_user), user, charge), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(gib_user), user, discharged_energy), 3 SECONDS) return MANUAL_SUICIDE /obj/item/stock_parts/power_store/proc/gib_user(mob/living/user, discharged_energy)