shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update emote.dm

Browse Source
This commit is contained in:
LetterJay
2018-01-28 15:13:12 -06:00
committed by GitHub
parent ca8f80e454
commit 044c13f607
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -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