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
2017-10-30 20:35:24 -05:00
committed by GitHub
parent 93f39805e9
commit ca1581bd11
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,21 +87,13 @@
if(!..())
return FALSE
var/mob/living/carbon/human/H = user
<<<<<<< HEAD
if(H.dna && H.dna.species && ((H.dna.features["tail_lizard"] != "None") || (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) || (H.dna.features["tail_human"] != "None")))
>>>>>>> 0eeddd8... tail wag fix
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(("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts))
>>>>>>> 0eeddd8... tail wag fix
. = null
//Don't know where else to put this, it's basically an emote