From 15ab9740cd149f349e40336729fb75d26aa086bd Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Wed, 14 Jun 2023 16:02:30 -0400
Subject: [PATCH] power fist no longer works when user is pacified (#21293)
---
code/game/objects/items/weapons/powerfist.dm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index 92a0d9d416b..5b8a6f90fd0 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -83,6 +83,9 @@
/obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, "You don't want to harm other living beings!")
+ return
if(!tank)
to_chat(user, "[src] can't operate without a source of gas!")
return