From 9e58d93fd6d29728f8887c50738812d5486346c1 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 16 Aug 2013 01:01:12 -0700 Subject: [PATCH] Removing snowflake checks for Soghun. --- code/modules/client/preferences.dm | 2 +- code/modules/mob/new_player/new_player.dm | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index bac3cbaaa47..597ad94ebfd 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -807,7 +807,7 @@ datum/preferences if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it! for(var/S in whitelisted_species) - if(is_alien_whitelisted(user,S) || (S == "Unathi" && is_alien_whitelisted(user,"Soghun"))) + if(is_alien_whitelisted(user,S)) new_species += S whitelisted = 1 if(!whitelisted) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index b8202845b0f..9fa5357d103 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -134,9 +134,7 @@ if(client.prefs.species != "Human") - var/S = client.prefs.species - if(S == "Unathi") S = "Soghun" - if(!is_alien_whitelisted(src, S) && config.usealienwhitelist) + if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist) src << alert("You are currently not whitelisted to play [client.prefs.species].") return 0 @@ -151,9 +149,7 @@ usr << "\blue There is an administrative lock on entering the game!" return - var/S = client.prefs.species - if(S == "Unathi") S = "Soghun" - if(!is_alien_whitelisted(src, S) && config.usealienwhitelist) + if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist) src << alert("You are currently not whitelisted to play [client.prefs.species].") return 0 @@ -351,7 +347,7 @@ if(client.prefs.species) chosen_species = all_species[client.prefs.species] if(chosen_species) - if(is_alien_whitelisted(src, client.prefs.species) || (client.prefs.species == "Unathi" && is_alien_whitelisted(src, "Soghun")) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED)) + if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED)) new_character.set_species(client.prefs.species) if(chosen_species.language) new_character.add_language(chosen_species.language)