cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14607 from VOREStation/upstream-merge-8988

Browse Source 
[MIRROR] Fixes an oversight with default emote retrieval.
This commit is contained in:
Heroman3003
2023-03-09 15:15:17 +10:00
committed by CHOMPStation2
parent ba25f3c417
commit b83f351431
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,7 +324,7 @@ var/list/_simple_mob_default_emotes = list(
/mob/living/carbon/human/get_available_emotes()
. = global._human_default_emotes.Copy()
if(length(species?.default_emotes))
. |= species.default_emotes
return . | species.default_emotes
/mob/living/simple_mob/get_available_emotes()
. = global._simple_mob_default_emotes.Copy()