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

Merge pull request #13276 from timothyteakettle/emotes

Browse Source 
every emote is unrestricted
This commit is contained in:
silicons
2020-08-29 21:21:01 -07:00
committed by GitHub
parent d8e0f9df1a b3c459c59c
commit 7ad037ee53
10 changed files with 4 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/emotes.dm
+3 -2
View File
@@ -102,8 +102,9 @@
/datum/emote/proc/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
. = TRUE
if(!is_type_in_typecache(user, mob_type_allowed_typecache))
return FALSE
if(mob_type_allowed_typecache) //empty list = anyone can use it unless specifically blacklisted
if(!is_type_in_typecache(user, mob_type_allowed_typecache))
return FALSE
if(is_type_in_typecache(user, mob_type_blacklist_typecache))
return FALSE
if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache))