diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8743649c66..0a1a250dc9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -296,7 +296,9 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) - if((zone_selected == BODY_ZONE_PRECISE_GROIN) && isfelinid(src) && isfelinid(M)) + var/self_tailcheck = dna?.species?.mutant_bodyparts["mam_tail"] && (dna.species.mutant_bodyparts["mam_tail"] != "None") + var/other_tailcheck = M.dna?.species?.mutant_bodyparts["mam_tail"] && (M.dna.species.mutant_bodyparts["mam_tail"] != "None") + if((zone_selected == BODY_ZONE_PRECISE_GROIN) && self_tailcheck && other_tailcheck) visible_message("[src] coils their tail with [AM], pulling them along!", "[src] has entwined their tail with yours, pulling you along!") else visible_message("[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by [M.p_their()] hands":" passively"]!",