From fd1012d0d2e33df910edb7a026844ba70d3d2136 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 28 Mar 2021 21:37:09 +0200 Subject: [PATCH] Hair style fixes. Can color facial hair again. Fix sort for hair styles to use name instead of ID. --- Content.Client/UserInterface/HumanoidProfileEditor.cs | 2 +- Content.Shared/Preferences/Appearance/HairStyles.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Client/UserInterface/HumanoidProfileEditor.cs b/Content.Client/UserInterface/HumanoidProfileEditor.cs index 55319fba4b..2626b963f7 100644 --- a/Content.Client/UserInterface/HumanoidProfileEditor.cs +++ b/Content.Client/UserInterface/HumanoidProfileEditor.cs @@ -802,7 +802,7 @@ namespace Content.Client.UserInterface Profile.Appearance.FacialHairColor, Profile.Appearance.FacialHairStyleId, SpriteAccessoryCategories.HumanFacialHair, - false); + true); } private void UpdateEyePickers() diff --git a/Content.Shared/Preferences/Appearance/HairStyles.cs b/Content.Shared/Preferences/Appearance/HairStyles.cs index f33b522bf4..9c88ddbea8 100644 --- a/Content.Shared/Preferences/Appearance/HairStyles.cs +++ b/Content.Shared/Preferences/Appearance/HairStyles.cs @@ -30,7 +30,7 @@ namespace Content.Shared.Preferences.Appearance if (cmp != 0) return cmp; - return string.Compare(a.ID, b.ID, StringComparison.CurrentCulture); + return string.Compare(a.Name, b.Name, StringComparison.CurrentCulture); }); } }