From 3ce8c4576cfc0dafb8ed058ca333c6df8fd156b5 Mon Sep 17 00:00:00 2001 From: ancient-engineer <103686984+ancient-engineer@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:25:25 -0700 Subject: [PATCH] Fixes power gloves dusting you if the power is less then 10 GWs instead of dusting you if greater then or equal to 10 GWs --- monkestation/code/modules/clothing/gloves/power_gloves.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/monkestation/code/modules/clothing/gloves/power_gloves.dm b/monkestation/code/modules/clothing/gloves/power_gloves.dm index b643bc69ee92..5caefddf16e9 100644 --- a/monkestation/code/modules/clothing/gloves/power_gloves.dm +++ b/monkestation/code/modules/clothing/gloves/power_gloves.dm @@ -46,11 +46,10 @@ return if(power >= dust_power) //Dusts if there's enough in the grid - electrocute_victim.electrocute_act(shock_damage, source, 1, SHOCK_TESLA | ((zap_flags & ZAP_MOB_STUN) ? NONE : SHOCK_NOSTUN)) + electrocute_victim.dust(TRUE, FALSE, TRUE) log_combat(owner, target, "zapped", /obj/item/clothing/gloves/color/yellow/power_gloves, "[power] watts were used resulting in [shock_damage] damage.") - else - electrocute_victim.dust(TRUE, FALSE, TRUE) + electrocute_victim.electrocute_act(shock_damage, source, 1, SHOCK_TESLA | ((zap_flags & ZAP_MOB_STUN) ? NONE : SHOCK_NOSTUN)) log_combat(owner, target, "zapped", /obj/item/clothing/gloves/color/yellow/power_gloves, "[power] watts were used resulting in the target dusting.") return