Fix whitelists (#1411)

Sending non-text will never create issues anymore.
This commit is contained in:
skull132
2017-01-07 17:37:02 +02:00
committed by GitHub
parent 553ebfbb24
commit a78209d2e6
2 changed files with 5 additions and 1 deletions
+4
View File
@@ -74,6 +74,10 @@ var/list/whitelist = list()
if (!M || !species)
return 0
if (istype(species, /datum/species))
var/datum/species/S = species
species = S.name
if (lowertext(species) == "human")
return 1
@@ -642,7 +642,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
if(!(current_species.spawn_flags & CAN_JOIN))
restricted = 2
else if((current_species.spawn_flags & IS_WHITELISTED) && !is_alien_whitelisted(preference_mob(),current_species))
else if((current_species.spawn_flags & IS_WHITELISTED) && !is_alien_whitelisted(preference_mob(),current_species.name))
restricted = 1
if(restricted)