Skip to content

Commit

Permalink
Fixes power gloves dusting you if the power is less then 10 GWs inste…
Browse files Browse the repository at this point in the history
…ad of dusting you if greater then or equal to 10 GWs (#3531)
  • Loading branch information
ancient-engineer authored Sep 23, 2024
1 parent a81380e commit 8a94a84
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions monkestation/code/modules/clothing/gloves/power_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8a94a84

Please sign in to comment.