Merge pull request #653 from VOREStation/fix541-again

Fixes attacking from inside voremobs, again
2026-07-21 12:05:28 +01:00 · 2016-10-18 14:47:03 -04:00
parent be94fe456d 066e50e61e
commit af4ef14bc6
1 changed files with 2 additions and 0 deletions
@@ -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("<span class='danger'>\The [src] has been attacked with \the [O] by [user].</span>")