cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "check if species can use an emote even if their mob type can't (#24361)" (#24490)

Browse Source 
This reverts commit 6eb4f32539.
This commit is contained in:
cybercapitalism
2024-03-07 17:57:04 +00:00
committed by GitHub
parent 20096f3592
commit 8518116cf5
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/emote.dm
+2 -6
View File
@@ -477,9 +477,9 @@
. = TRUE
if(!is_type_in_typecache(user, mob_type_allowed_typecache))
return FALSE
if(is_type_in_typecache(user, mob_type_blacklist_typecache))
return FALSE
// the user's mob type may not be allowed, but its species could be
var/species_can_use = FALSE
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.dna)
@@ -489,10 +489,6 @@
if(species_type_blacklist_typecache && is_type_in_typecache(H.dna.species, species_type_blacklist_typecache))
return FALSE
species_can_use = TRUE
if(is_type_in_typecache(user, mob_type_blacklist_typecache) && !species_can_use)
return FALSE
if(intentional && only_unintentional)
return FALSE