From ca8f80e45480dd97e86453cbd93ea093e8023399 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 25 Jan 2018 22:48:55 -0500 Subject: [PATCH 1/2] Fixes not being able to stop tail wagging --- code/modules/mob/living/carbon/human/emote.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 5b756fd3d5..c1afb5b9e8 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -83,19 +83,31 @@ H.endTailWag() /mob/living/carbon/human/proc/is_wagging_tail() +<<<<<<< HEAD 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)) +======= + return (dna && dna.species && (("waggingtail_lizard" in dna.species.mutant_bodyparts) || ("waggingtail_human" in dna.species.mutant_bodyparts))) +>>>>>>> bcf16ee... Merge pull request #34913 from YPOQ/wagfix /datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE) if(!..()) return FALSE var/mob/living/carbon/human/H = user +<<<<<<< HEAD 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))) +======= + if(H.dna && H.dna.species && (("tail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("tail_human" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts))) +>>>>>>> bcf16ee... Merge pull request #34913 from YPOQ/wagfix return TRUE /datum/emote/living/carbon/human/wag/select_message_type(mob/user) . = ..() var/mob/living/carbon/human/H = user +<<<<<<< HEAD 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)) +======= + if(H.is_wagging_tail()) +>>>>>>> bcf16ee... Merge pull request #34913 from YPOQ/wagfix . = null //Don't know where else to put this, it's basically an emote From 044c13f607ebd20040f06d8197384ad9fc7635a8 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 28 Jan 2018 15:13:12 -0600 Subject: [PATCH 2/2] Update emote.dm --- code/modules/mob/living/carbon/human/emote.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index c1afb5b9e8..10963e031b 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -83,31 +83,19 @@ H.endTailWag() /mob/living/carbon/human/proc/is_wagging_tail() -<<<<<<< HEAD - 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)) -======= return (dna && dna.species && (("waggingtail_lizard" in dna.species.mutant_bodyparts) || ("waggingtail_human" in dna.species.mutant_bodyparts))) ->>>>>>> bcf16ee... Merge pull request #34913 from YPOQ/wagfix /datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE) if(!..()) return FALSE var/mob/living/carbon/human/H = user -<<<<<<< HEAD - 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))) -======= if(H.dna && H.dna.species && (("tail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("tail_human" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts))) ->>>>>>> bcf16ee... Merge pull request #34913 from YPOQ/wagfix return TRUE /datum/emote/living/carbon/human/wag/select_message_type(mob/user) . = ..() var/mob/living/carbon/human/H = user -<<<<<<< HEAD - 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)) -======= if(H.is_wagging_tail()) ->>>>>>> bcf16ee... Merge pull request #34913 from YPOQ/wagfix . = null //Don't know where else to put this, it's basically an emote