cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes high frequency blade ignoring pacifism trait (#72754)

Browse Source 
## 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
🆑
fix: Wielded high frequency blades no longer ignore pacifism
/🆑
This commit is contained in:
SuperSlayer
2023-01-23 12:02:14 +01:00
committed by GitHub
parent a134572dea
commit 961029548e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+1 -1
View File
@@ -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)