From 3331a39cc85267e8b1219790c3fde072eb85c1dc Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Wed, 25 Nov 2015 17:13:51 -0500 Subject: [PATCH] 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