From 3178cf2fcc044e06bc25258880c6fb7770b91839 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 22 Mar 2023 08:47:03 +0100 Subject: [PATCH] [MIRROR] NODISMEMBER mobs are no longer miraculously immune to the flesh heretic worm [MDB IGNORE] (#20008) * NODISMEMBER mobs are no longer miraculously immune to the flesh heretic worm (#74141) When the NODISMEMBER trait check was passed, it would return without calling the rest of AttackingTarget and not actually follow through with dealing the damage. Now, the early return calls parent and completes normally. * NODISMEMBER mobs are no longer miraculously immune to the flesh heretic worm --------- Co-authored-by: Rhials --- .../mob/living/simple_animal/hostile/heretic_monsters.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm b/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm index 962afa822b6..3e835f0b334 100644 --- a/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm +++ b/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm @@ -322,7 +322,8 @@ if(iscarbon(target)) var/mob/living/carbon/carbon_target = target if(HAS_TRAIT(carbon_target, TRAIT_NODISMEMBER)) - return + return ..() + var/list/parts_to_remove = list() for(var/obj/item/bodypart/bodypart in carbon_target.bodyparts) if(bodypart.body_part != HEAD && bodypart.body_part != CHEST && bodypart.body_part != LEG_LEFT && bodypart.body_part != LEG_RIGHT)