From c10137a118de7c2f426b69df787aba1e2d5e8d51 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 29 Jun 2013 19:08:41 -0700 Subject: [PATCH] Fixes #3184 --- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- code/modules/mob/new_player/new_player.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 811ffb2fb8d..c54fef44215 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -323,7 +323,7 @@ proc/get_damage_icon_part(damage_state, body_part) stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_s"), ICON_OVERLAY) //Underwear - if(underwear >0 && underwear < 12) + if(underwear >0 && underwear < 12 && (src.dna.mutantrace != "vox" && src.dna.mutantrace != "kidan")) if(!fat && !skeleton) stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 85f2582f902..7c9ef307e69 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -340,19 +340,19 @@ new_character.lastarea = get_area(loc) if(client.prefs.species == "Tajaran") //This is like the worst, but it works, so meh. - Erthilo - if(is_alien_whitelisted(src, "Tajaran"|| !config.usealienwhitelist)) + if(is_alien_whitelisted(src, "Tajaran") || !config.usealienwhitelist) new_character.dna.mutantrace = "tajaran" new_character.tajaran_talk_understand = 1 if(client.prefs.species == "Unathi") - if(is_alien_whitelisted(src, "Soghun"|| !config.usealienwhitelist)) + if(is_alien_whitelisted(src, "Soghun") || !config.usealienwhitelist) new_character.dna.mutantrace = "lizard" new_character.soghun_talk_understand = 1 if(client.prefs.species == "Skrell") - if(is_alien_whitelisted(src, "Skrell"|| !config.usealienwhitelist)) + if(is_alien_whitelisted(src, "Skrell") || !config.usealienwhitelist) new_character.dna.mutantrace = "skrell" new_character.skrell_talk_understand = 1 if(client.prefs.species == "Kidan") - if(is_alien_whitelisted(src, "Kidan"|| !config.usealienwhitelist)) + if(is_alien_whitelisted(src, "Kidan") || !config.usealienwhitelist) new_character.dna.mutantrace = "kidan" new_character.kidan_talk_understand = 1