From 4520850d4fe42372667ee1c5298d7197cdcce443 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Sat, 12 Oct 2024 08:12:02 -0700 Subject: [PATCH] [MIRROR] Disables random hair (#9215) Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Co-authored-by: CHOMPStation2 --- code/modules/client/preference_setup/general/03_body.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 88d8d3d11c..199b1844cd 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -760,7 +760,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/list/valid_hairstyles = pref.get_valid_hairstyles() if(valid_hairstyles.len) - pref.h_style = pick(valid_hairstyles) + if(!(pref.h_style in valid_hairstyles)) + pref.h_style = pick(valid_hairstyles) else //this shouldn't happen pref.h_style = hair_styles_list["Bald"] @@ -769,7 +770,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() if(valid_facialhairstyles.len) - pref.f_style = pick(valid_facialhairstyles) + if(!(pref.f_style in valid_facialhairstyles)) + pref.f_style = pick(valid_facialhairstyles) else //this shouldn't happen pref.f_style = facial_hair_styles_list["Shaved"]