mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
[MIRROR] basic mob attack now has should_call_parent [MDB IGNORE] (#17715)
* basic mob attack now has should_call_parent (#71461) Adds SHOULD_CALL_PARENT onto basic mob's attack chain, because of a previous issue that living and obj didn't call parent. This PR originally fixed it, but another PR did the exact same fix, so this is just adding the forced parent call. * basic mob attack now has should_call_parent * obj_defense skew Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user