From 1c1ebe717b60d4c646de6e26a248b062d7058f7c Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 18 Jul 2016 09:30:39 -0400 Subject: [PATCH] tweak --- code/game/objects/items/weapons/powerfist.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm index 444752e2fea..0ca872283e6 100644 --- a/code/game/objects/items/weapons/powerfist.dm +++ b/code/game/objects/items/weapons/powerfist.dm @@ -16,6 +16,12 @@ var/obj/item/weapon/tank/tank = null //Tank used for the gauntlet's piston-ram. +/obj/item/weapon/melee/powerfist/Destroy() + if(tank) + qdel(tank) + tank = null + return ..() + /obj/item/weapon/melee/powerfist/examine(mob/user) ..() if(!in_range(user, src)) @@ -24,7 +30,6 @@ if(tank) to_chat(user, "\icon [tank] It has \the [tank] mounted onto it.") - /obj/item/weapon/melee/powerfist/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/tank)) if(!tank) @@ -76,6 +81,9 @@ to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!") playsound(loc, 'sound/effects/refill.ogg', 50, 1) return + + user.do_attack_animation(target) + target.apply_damage(force * fisto_setting, BRUTE) target.visible_message("[user]'s powerfist lets out a loud hiss as they punch [target.name]!", \ "You cry out in pain as [user]'s punch flings you backwards!")