From 2e5f80175c18f61f6069be489632ae5ee4454de1 Mon Sep 17 00:00:00 2001 From: Eearslya Sleiarion Date: Wed, 5 Oct 2016 09:50:04 -0700 Subject: [PATCH] Prevent attacking vore mobs from within them (#627) --- code/modules/mob/living/simple_animal/simple_animal.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 20606fc5da..32235e5896 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -310,6 +310,8 @@ M.do_attack_animation(src) if(I_HURT) + if (M.loc == src) + return // VOREStation Edit adjustBruteLoss(harm_intent_damage) M.visible_message("\red [M] [response_harm] \the [src]") M.do_attack_animation(src) @@ -637,4 +639,4 @@ if(!target_mob || enroute) spawn(10) if(!src.stat) - horde() \ No newline at end of file + horde()