cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] basic mob attack now has should_call_parent [MDB IGNORE] (#17715)

Browse Source 
* 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:
SkyratBot
2022-11-28 12:05:29 -05:00
committed by GitHub
co-authored by san7890 Zonespace tastyfish
parent e1bcd32594
commit 7f09cedf89
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/obj_defense.dm
+2
View File
@@ -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