diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index f7f00de4579..06c2d9dd467 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -159,6 +159,7 @@ ///Apparently this is only used by AI datums for basic mobs. A player controlling a basic mob will call attack_animal() when clicking another atom. /atom/proc/attack_basic_mob(mob/user, list/modifiers) + SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_BASIC_MOB, user) ///Attacked by monkey. It doesn't need its own *_secondary proc as it just uses attack_hand_secondary instead. diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 2960174baf6..bacd813ba68 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -54,6 +54,7 @@ playsound(src.loc, 'sound/weapons/slash.ogg', 100, TRUE) /obj/attack_basic_mob(mob/living/basic/user, list/modifiers) + . = ..() if(!user.melee_damage_upper && !user.obj_damage) //No damage user.emote("custom", message = "[user.friendly_verb_continuous] [src].") return FALSE @@ -66,6 +67,7 @@ playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE) /obj/attack_animal(mob/living/simple_animal/user, list/modifiers) + . = ..() if(!user.melee_damage_upper && !user.obj_damage) user.emote("custom", message = "[user.friendly_verb_continuous] [src].") return FALSE