fixes admin whitelist bypass (#7198)

Author: silicons

code/modules/mob/new_player/new_player.dm

@@ -520,7 +520,7 @@ INITIALIZE_IMMEDIATE(/mob/new_player)
 
 	if(chosen_species && use_species_name)
 		// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
-		if(!(chosen_species.species_spawn_flags & SPECIES_SPAWN_WHITELISTED) || chosen_species.check_whitelist_for_ckey(ckey))
+		if(!(chosen_species.species_spawn_flags & SPECIES_SPAWN_WHITELISTED) || chosen_species.check_whitelist_for_ckey(ckey) || has_admin_rights())
 			new_character = new(T, use_species_name)
 
 	if(!new_character)
@@ -610,7 +610,7 @@ INITIALIZE_IMMEDIATE(/mob/new_player)
 	if(!chosen_species)
 		return SPECIES_HUMAN
 
-	if(!(chosen_species.species_spawn_flags & SPECIES_SPAWN_WHITELISTED) || chosen_species.check_whitelist_for_ckey(ckey))
+	if(!(chosen_species.species_spawn_flags & SPECIES_SPAWN_WHITELISTED) || chosen_species.check_whitelist_for_ckey(ckey) || has_admin_rights())
 		return chosen_species.name
 
 	return SPECIES_HUMAN

code/modules/preferences/preference_setup/background/species.dm

@@ -21,7 +21,7 @@
 			. += SPAN_GREEN("do")
 		else
 			. += SPAN_RED("do not")
-		. += " have the whitelist to play as one."
+		. += " have the whitelist to play as one[check_rights(C = prefs.client) ? ", but have administrative override to do so" : ""]."
 	. += "</center>"
 	. += "<div class='statusDisplay'>"
 	. += "[CS.blurb]"
@@ -32,7 +32,7 @@
 	if((CS.species_spawn_flags & SPECIES_SPAWN_RESTRICTED) && !(flags & PREF_COPY_TO_NO_CHECK_SPECIES))
 		errors?.Add(SPAN_WARNING("[CS.name] is a restricted species. You cannot join as this as most normal roles."))
 		return FALSE
-	if((CS.species_spawn_flags & SPECIES_SPAWN_WHITELISTED) && !CS.check_whitelist_for_ckey(prefs.client_ckey))
+	if((CS.species_spawn_flags & SPECIES_SPAWN_WHITELISTED) && !CS.check_whitelist_for_ckey(prefs.client_ckey) && !check_rights(C = prefs.client))
 		errors?.Add(SPAN_WARNING("You do not have the whitelist to play as a [CS.name]."))
 		return FALSE
 	return TRUE

code/modules/preferences/preference_setup/helpers/species_pick.dm

@@ -20,7 +20,7 @@
  * check if we can play a species
  */
 /datum/preferences/proc/check_character_species(datum/species/CS)
-	if((CS.species_spawn_flags & SPECIES_SPAWN_SECRET) && !CS.check_whitelist_for_ckey(client_ckey))
+	if((CS.species_spawn_flags & SPECIES_SPAWN_SECRET) && !CS.check_whitelist_for_ckey(client_ckey) && !check_rights(C = client))
 		return FALSE
 	return TRUE