From 1e36372d3e9d2da163f4855697065fc297636218 Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Wed, 25 Nov 2015 17:08:52 -0500 Subject: [PATCH 1/2] Icon names gotta match. --- code/modules/mob/new_player/preferences_setup.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 6f9e9ad1440..5097cecc926 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -257,19 +257,19 @@ datum/preferences if(underwear && current_species.clothing_flags & HAS_UNDERWEAR) var/datum/sprite_accessory/underwear/U = underwear_list[underwear] if(U) - underwear_s = new/icon(U.icon, "[U.icon_state]_s", ICON_OVERLAY) + underwear_s = new/icon(U.icon, "uw_[U.icon_state]_s", ICON_OVERLAY) var/icon/undershirt_s = null if(undershirt && current_species.clothing_flags & HAS_UNDERSHIRT) var/datum/sprite_accessory/undershirt/U2 = undershirt_list[undershirt] if(U2) - undershirt_s = new/icon(U2.icon, "[U2.icon_state]_s", ICON_OVERLAY) + undershirt_s = new/icon(U2.icon, "us_[U2.icon_state]_s", ICON_OVERLAY) var/icon/socks_s = null if(socks && current_species.clothing_flags & HAS_SOCKS) var/datum/sprite_accessory/socks/U3 = socks_list[socks] if(U3) - socks_s = new/icon(U3.icon, "[U3.icon_state]_s", ICON_OVERLAY) + socks_s = new/icon(U3.icon, "sk_[U3.icon_state]_s", ICON_OVERLAY) var/icon/clothes_s = null var/uniform_dmi='icons/mob/uniform.dmi' From 3331a39cc85267e8b1219790c3fde072eb85c1dc Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Wed, 25 Nov 2015 17:13:51 -0500 Subject: [PATCH 2/2] Vulp tails need love. --- code/modules/client/preferences.dm | 2 +- code/modules/mob/new_player/preferences_setup.dm | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b1c8e53ff1f..d301db27226 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1190,7 +1190,7 @@ datum/preferences var/new_body_accessory = input(user, "Choose your body accessory:", "Character Preference") as null|anything in possible_body_accessories if(new_body_accessory) - body_accessory = new_body_accessory + body_accessory = (new_body_accessory == "None") ? null : new_body_accessory if("facial") var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference") as color|null diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 5097cecc926..7db9f502bfa 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -223,7 +223,18 @@ datum/preferences //Tail if(current_species && (current_species.bodyflags & HAS_TAIL)) - var/icon/temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[current_species.tail]_s") + var/tail_icon + var/tail_icon_state + + if(body_accessory) + var/datum/body_accessory/accessory = body_accessory_by_name[body_accessory] + tail_icon = accessory.icon + tail_icon_state = accessory.icon_state + else + tail_icon = "icons/effects/species.dmi" + tail_icon_state = "[current_species.tail]_s" + + var/icon/temp = new /icon("icon" = tail_icon, "icon_state" = tail_icon_state) preview_icon.Blend(temp, ICON_OVERLAY) // Skin color