Merge pull request #6191 from Krausus/CharacterSlotFixes

Character Slot Randomization and Loading Fixes
This commit is contained in:
Fox McCloud
2017-01-16 13:31:19 -05:00
committed by GitHub
4 changed files with 32 additions and 20 deletions
@@ -25,6 +25,8 @@
/mob/new_player/proc/new_player_panel_proc()
var/real_name = client.prefs.real_name
if(client.prefs.randomslot)
real_name = "Random Character Slot"
var/output = "<center><p><a href='byond://?src=[UID()];show_preferences=1'>Setup Character</A><br /><i>[real_name]</i></p>"
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
@@ -169,6 +171,9 @@
to_chat(usr, "\blue There is an administrative lock on entering the game!")
return
if(client.prefs.randomslot)
client.prefs.load_random_character_slot(client)
if(client.prefs.species in whitelisted_species)
if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species]."))