From e223a8b4adacfe553e2af45ef23d3552b480f097 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 2 Jul 2019 07:27:19 -0500 Subject: [PATCH] Merge pull request #6251 from Heroman3003/reactionfix Fixes retaliate mobs ignoring melee attacks --- code/modules/mob/living/living_defense.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index b3ee75349c9..6384e904662 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -216,6 +216,9 @@ /mob/living/proc/hit_with_weapon(obj/item/I, mob/living/user, var/effective_force, var/hit_zone) visible_message("[src] has been [I.attack_verb.len? pick(I.attack_verb) : "attacked"] with [I.name] by [user]!") + if(ai_holder) + ai_holder.react_to_attack(user) + var/soaked = get_armor_soak(hit_zone, "melee") var/blocked = run_armor_check(hit_zone, "melee")