From bcb327959f2fc47226c66fbd861e22b1f3a89e04 Mon Sep 17 00:00:00 2001 From: Mek Date: Mon, 29 Aug 2022 11:30:22 -0400 Subject: [PATCH] mmstamina --- code/_onclick/item_attack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index cdd0e8b510e1..db615cb8e608 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -75,7 +75,7 @@ if(item_flags & NOBLUDGEON) return - if(force && HAS_TRAIT(user, TRAIT_PACIFISM)) + if(force && HAS_TRAIT(user, TRAIT_PACIFISM) && (damtype != STAMINA)) to_chat(user, span_warning("You don't want to harm other living beings!")) return TRUE