From 655067471a81ae12f8d2c41a7821920b4079f109 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 14 Jan 2018 03:50:26 -0600 Subject: [PATCH] Fixes *wag for mammals Someone forgot that we have snowflake bodyparts. --- code/modules/mob/living/carbon/human/emote.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 752a9d6471..35aecbf6cb 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -81,19 +81,19 @@ H.endTailWag() /mob/living/carbon/human/proc/is_wagging_tail() - return (dna && dna.species && ("waggingtail_lizard" in dna.species.mutant_bodyparts || "waggingtail_human" in dna.species.mutant_bodyparts)) + return (dna && dna.species && ("waggingtail_lizard" in dna.species.mutant_bodyparts || "waggingtail_human" in dna.species.mutant_bodyparts || "mam_waggingtail" in dna.species.mutant_bodyparts)) /datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE) if(!..()) return FALSE var/mob/living/carbon/human/H = user - if(H.dna && H.dna.species && (("tail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || (H.dna.features["tail_human"] != "None"))) + if(H.dna && H.dna.species && (("tail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || (H.dna.features["tail_human"] != "None") || ("mam_tail" in H.dna.species.mutant_bodyparts))) return TRUE /datum/emote/living/carbon/human/wag/select_message_type(mob/user) . = ..() var/mob/living/carbon/human/H = user - if(("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts)) + if(("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts) || ("mam_waggingtail" in H.dna.species.mutant_bodyparts)) . = null //Don't know where else to put this, it's basically an emote @@ -108,6 +108,9 @@ if("tail_human" in dna.species.mutant_bodyparts) dna.species.mutant_bodyparts -= "tail_human" dna.species.mutant_bodyparts |= "waggingtail_human" + if("mam_tail" in dna.species.mutant_bodyparts) + dna.species.mutant_bodyparts -= "mam_tail" + dna.species.mutant_bodyparts |= "mam_waggingtail" update_body() /mob/living/carbon/human/proc/endTailWag() @@ -121,6 +124,9 @@ if("waggingtail_human" in dna.species.mutant_bodyparts) dna.species.mutant_bodyparts -= "waggingtail_human" dna.species.mutant_bodyparts |= "tail_human" + if("mam_waggingtail" in dna.species.mutant_bodyparts) + dna.species.mutant_bodyparts -= "mam_waggingtail" + dna.species.mutant_bodyparts |= "mam_tail" update_body() /datum/emote/living/carbon/human/wing