From a78209d2e679287d49bedd2e584726f1420d99fc Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 7 Jan 2017 17:37:02 +0200 Subject: [PATCH] Fix whitelists (#1411) Sending non-text will never create issues anymore. --- code/game/jobs/whitelist.dm | 4 ++++ code/modules/client/preference_setup/general/03_body.dm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index a3bb1c17f0b..ba0816b76c8 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -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 diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index c241d8ba5fa..61d388072cf 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -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)