Merge pull request #11727 from Putnam3145/vore-pacifist-fix

Makes pacifists able to vore properly
This commit is contained in:
kevinz000
2020-04-04 07:15:54 -07:00
committed by GitHub
2 changed files with 166 additions and 183 deletions
-11
View File
@@ -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, "<span class='notice'>You can't risk digestion!</span>")
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))