From fbab6ba7d5c3fbaf6692669b07dfe7a135e19ef1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 7 Apr 2021 15:53:36 +0200 Subject: [PATCH] [MIRROR] Pacifists can no longer swat bugs (#4721) * Pacifists can no longer swat bugs (#58177) Co-authored-by: Thunder12345 Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> * Pacifists can no longer swat bugs Co-authored-by: Thunder12345 Co-authored-by: Thunder12345 Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> --- code/game/objects/items/weaponry.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 4cd47e4f296..d5d4211fc0f 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -733,13 +733,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 . = ..() if(proximity_flag) if(is_type_in_typecache(target, strong_against)) - new /obj/effect/decal/cleanable/insectguts(target.drop_location()) - to_chat(user, "You easily splat the [target].") - if(istype(target, /mob/living/)) - var/mob/living/bug = target - bug.death(1) - else - qdel(target) + if(!HAS_TRAIT(user, TRAIT_PACIFISM)) + new /obj/effect/decal/cleanable/insectguts(target.drop_location()) + to_chat(user, "You easily splat [target].") + if(isliving(target)) + var/mob/living/bug = target + bug.gib() + else + qdel(target) /obj/item/proc/can_trigger_gun(mob/living/user) if(!user.can_use_guns(src))