From 5833f98ac5b721dfda013a492a7dff1688e7a9fe Mon Sep 17 00:00:00 2001 From: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:29:43 -0400 Subject: [PATCH] Buffs the powerfist (#18798) * Buffs the powerfist * Update code/game/objects/items/weapons/powerfist.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> --- code/game/objects/items/weapons/powerfist.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm index 9ff9da516cc..22c0e353f20 100644 --- a/code/game/objects/items/weapons/powerfist.dm +++ b/code/game/objects/items/weapons/powerfist.dm @@ -14,10 +14,9 @@ origin_tech = "combat=5;powerstorage=3;syndicate=3" var/click_delay = 1.5 var/fisto_setting = 1 - var/gasperfist = 3 + var/gasperfist = 0.5 var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram. - /obj/item/melee/powerfist/Destroy() QDEL_NULL(tank) return ..() @@ -66,7 +65,8 @@ if(!tank) to_chat(user, "[src] currently has no tank attached to it.") return - to_chat(user, "You detach [thetank] from [src].") + to_chat(user, "As you detach [thetank] from [src], the fist unlocks.") + flags &= ~NODROP tank.forceMove(get_turf(user)) user.put_in_hands(tank) tank = null @@ -76,9 +76,10 @@ return if(!user.unEquip(thetank)) return - to_chat(user, "You hook [thetank] up to [src].") + to_chat(user, "As you hook [thetank] up to [src], the fist locks into place around your arm.") tank = thetank thetank.forceMove(src) + flags |= NODROP /obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)