shitty webedit

2020-02-26 20:59:32 +00:00
parent 5bd62d129f
commit c708d30d47
1 changed files with 3 additions and 0 deletions
@@ -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