From 492546c05c3a68512976fcef7ee9162aa31d4484 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 3 Apr 2020 01:53:35 -0700 Subject: [PATCH] Pacifist digestion checks are elsewhere anyway --- code/modules/mob/living/living_defense.dm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 27ecaf30d5..9980d2b830 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -193,17 +193,6 @@ if(user == anchored || !isturf(user.loc)) return FALSE - //pacifist vore check. - if(user.pulling && HAS_TRAIT(user, TRAIT_PACIFISM) && user.voremode) //they can only do heals, noisy guts, absorbing (technically not harm) - if(ismob(user.pulling)) - var/mob/P = user.pulling - if(src != user) - to_chat(user, "You can't risk digestion!") - return FALSE - else - user.vore_attack(user, P, user) - return - //normal vore check. if(user.pulling && user.grab_state == GRAB_AGGRESSIVE && user.voremode) if(ismob(user.pulling))