From 066e50e61e07bbf62df27d8d756ef989065f3d43 Mon Sep 17 00:00:00 2001 From: Eearslya Date: Sun, 16 Oct 2016 15:36:47 -0700 Subject: [PATCH] Fixes attacking from inside voremobs, again Fixes #541 --- code/modules/mob/living/simple_animal/simple_animal.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d885450e84f..54356e34ea0 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -343,6 +343,8 @@ O.attack(src, user, user.zone_sel.selecting) /mob/living/simple_animal/hit_with_weapon(obj/item/O, mob/living/user, var/effective_force, var/hit_zone) + if (user.loc == src) + return 1 // VOREStation Edit visible_message("\The [src] has been attacked with \the [O] by [user].")