diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6486154e9c3..4f1f508a087 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -338,8 +338,8 @@ proc/get_damage_icon_part(damage_state, body_part) if(update_icons) update_icons() return - //mutants don't have hair. masks and helmets can obscure our hair too. - if( (dna && dna.mutantrace) || (head && (head.status & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR))) + //masks and helmets can obscure our hair. + if( (head && (head.status & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR))) if(update_icons) update_icons() return diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 952961ca88e..97b123825b1 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -402,6 +402,19 @@ var/mob/living/carbon/human/new_character = new(loc) new_character.lastarea = get_area(loc) + if(preferences.species == "Tajaran") //This is like the worst, but it works, so meh. - Erthilo + if(is_alien_whitelisted(src, "Tajaran") || !config.usealienwhitelist) + new_character.dna.mutantrace = "tajaran" + new_character.tajaran_talk_understand = 1 + if(preferences.species == "Soghun") + if(is_alien_whitelisted(src, "Soghun") || !config.usealienwhitelist) + new_character.dna.mutantrace = "lizard" + new_character.soghun_talk_understand = 1 + if(preferences.species == "Skrell") + if(is_alien_whitelisted(src, "Skrell") || !config.usealienwhitelist) + new_character.dna.mutantrace = "skrell" + new_character.skrell_talk_understand = 1 + if(ticker.random_players) new_character.gender = pick(MALE, FEMALE) preferences.randomize_name() @@ -423,19 +436,6 @@ new_character.dna.ready_dna(new_character) new_character.dna.b_type = preferences.b_type - if(preferences.species == "Tajaran") //This is like the worst, but it works, so meh. - Erthilo - if(is_alien_whitelisted(src, "Tajaran") || !config.usealienwhitelist) - new_character.dna.mutantrace = "tajaran" - new_character.tajaran_talk_understand = 1 - if(preferences.species == "Soghun") - if(is_alien_whitelisted(src, "Soghun") || !config.usealienwhitelist) - new_character.dna.mutantrace = "lizard" - new_character.soghun_talk_understand = 1 - if(preferences.species == "Skrell") - if(is_alien_whitelisted(src, "Skrell") || !config.usealienwhitelist) - new_character.dna.mutantrace = "skrell" - new_character.skrell_talk_understand = 1 - new_character.key = key //Manually transfer the key to log them in return new_character