From 961029548ebc99fa681e7b64abefa496dc48fb2c Mon Sep 17 00:00:00 2001
From: SuperSlayer <91609255+SuperSlayer0@users.noreply.github.com>
Date: Mon, 23 Jan 2023 13:02:14 +0200
Subject: [PATCH] Fixes high frequency blade ignoring pacifism trait (#72754)

## About The Pull Request

Fixes being able to slash mobs with wielded high frequency blades while
having pacifism trait.

## Why It's Good For The Game

Bugs are bad

## Changelog
:cl:
fix: Wielded high frequency blades no longer ignore pacifism
/:cl:
---
 code/game/objects/items/weaponry.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 38afc757842..0949403c596 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -1018,7 +1018,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		return TRUE
 
 /obj/item/highfrequencyblade/attack(mob/living/target, mob/living/user, params)
-	if(!HAS_TRAIT(src, TRAIT_WIELDED))
+	if(!HAS_TRAIT(src, TRAIT_WIELDED) || HAS_TRAIT(src, TRAIT_PACIFISM))
 		return ..()
 	slash(target, user, params)