From c708d30d47daf260808a2b38eb65954e6f57fc1a Mon Sep 17 00:00:00 2001 From: Lin Date: Wed, 26 Feb 2020 20:59:32 +0000 Subject: [PATCH] shitty webedit --- code/game/objects/structures/kitchen_spike.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 21622519c9..830f25277d 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -64,6 +64,9 @@ /obj/structure/kitchenspike/attack_hand(mob/user) if(VIABLE_MOB_CHECK(user.pulling) && user.a_intent == INTENT_GRAB && !has_buckled_mobs()) var/mob/living/L = user.pulling + if(has_trait(user, TRAIT_PACIFISM) && L.stat != DEAD) + to_chat(user, "You don't want to hurt a living creature!") + return if(do_mob(user, src, 120)) if(has_buckled_mobs()) //to prevent spam/queing up attacks return