Merge remote-tracking branch 'citadel/master' into mobility_flags

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, "<span class='warning'>You don't want to hurt a living creature!</span>")
+			return
 		if(do_mob(user, src, 120))
 			if(has_buckled_mobs()) //to prevent spam/queing up attacks
 				return