From 70b6a717ab52eef6e9e0ff694ece3826427257f2 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 7 Oct 2017 22:21:15 -0400 Subject: [PATCH] This then conflicts --- code/modules/mob/living/carbon/human/appearance.dm | 2 +- code/modules/mob/new_player/preferences_setup.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 0fd4b86f004..80b871e7996 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -21,7 +21,7 @@ gender = new_gender - var/datum/sprite_accessory/hair/current_hair = hair_styles_public_list[H.h_style] + var/datum/sprite_accessory/hair/current_hair = hair_styles_full_list[H.h_style] if(current_hair.gender != NEUTER && current_hair.gender != gender) reset_head_hair() diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 7de5b0e385b..63a8d5ad78c 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -341,7 +341,7 @@ face_s.Blend(eyes_s, ICON_OVERLAY) - var/datum/sprite_accessory/hair_style = hair_styles_public_list[h_style] + var/datum/sprite_accessory/hair_style = hair_styles_full_list[h_style] if(hair_style) var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") if(current_species.name == "Slime People") // whee I am part of the problem