diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm index af57b4c18d4..bcbe102c5e6 100644 --- a/code/game/objects/items/weapons/melee/shock_maul.dm +++ b/code/game/objects/items/weapons/melee/shock_maul.dm @@ -47,8 +47,10 @@ wielded = 1 if(status) force = initial(force)*charge_force_mult + armor_penetration *= charge_force_mult else force = initial(force) + armor_penetration = initial(armor_penetration) launch_force = initial(launch_force) weaken_force = initial(weaken_force) name = "[initial(name)] (wielded)" @@ -57,8 +59,10 @@ wielded = 0 if(status) force = force_unwielded*charge_force_mult + armor_penetration *= charge_force_mult else force = force_unwielded + armor_penetration = initial(armor_penetration) launch_force = launch_force_unwielded weaken_force = weaken_force_unwielded name = "[initial(name)]" @@ -193,12 +197,10 @@ user.visible_message("[user] charges \the [src]!","You charge \the [src]. It's hammer time!") playsound(src, "sparks", 75, 1, -1) update_held_icon() - armor_penetration *= charge_force_mult else if(status) status = 0 user.visible_message("[user] safely disengages \the [src]'s power field.","\The [src] is now off.") update_held_icon() - armor_penetration = initial(armor_penetration) playsound(src, "sparks", 75, 1, -1) if(!bcell) to_chat(user, "\The [src] does not have a power source!")