diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index e19895e590..cbb711ffc2 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -160,7 +160,7 @@ return ..() /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0) - if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && iscarbon(pulling)) + if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling)) vore_attack(user, pulling) else ..() diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index a7e2f803f1..b01862e730 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -10,7 +10,10 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if("grab") - grabbedby(M) + if(grab_state >= GRAB_AGGRESSIVE && isliving(pulling)) + vore_attack(M, pulling) + else + grabbedby(M) if("harm", "disarm") M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)