From c708d30d47daf260808a2b38eb65954e6f57fc1a Mon Sep 17 00:00:00 2001 From: Lin Date: Wed, 26 Feb 2020 20:59:32 +0000 Subject: [PATCH 1/4] 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 From ac384e4d703378d1cb2d152951aa09bd7657c89e Mon Sep 17 00:00:00 2001 From: Lin Date: Wed, 26 Feb 2020 21:01:34 +0000 Subject: [PATCH 2/4] consistency? --- code/game/objects/structures/kitchen_spike.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 830f25277d..91266423e6 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -65,7 +65,7 @@ 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!") + 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 From 69e3d857a8324586771eaf7c6c38667cbf624f7e Mon Sep 17 00:00:00 2001 From: Lin Date: Wed, 26 Feb 2020 21:39:53 +0000 Subject: [PATCH 3/4] derp --- code/game/objects/structures/kitchen_spike.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 91266423e6..dc00abd264 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -65,7 +65,7 @@ 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!") + 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 From 2c642d550745a9850c40c10c9fb0182a0002a7d7 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 27 Feb 2020 01:10:38 +0100 Subject: [PATCH 4/4] Update kitchen_spike.dm --- code/game/objects/structures/kitchen_spike.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index dc00abd264..ebac89579b 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -64,7 +64,7 @@ /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) + 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))