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))