Fix: Tajara hairs save fix (#675)

* Update preferences_savefile.dm * Update preferences_savefile.dm Signed-off-by: MrCat15352 <[email protected]> --------- Signed-off-by: MrCat15352 <[email protected]> Co-authored-by: MrCat15352 <[email protected]>
CeladonSS13 · Jun 7, 2024 · 8810443 · 8810443
1 parent a1f08c2
commit 8810443
Showing 1 changed file with 31 additions and 10 deletions.
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
@@ -514,17 +514,38 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	randomise = SANITIZE_LIST(randomise)
 
-	if(gender == MALE)
-		hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_male_list)
-		facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list)
-	else if(gender == FEMALE)
-		hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_female_list)
-		facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list)
+	// [CELADON-EDIT] - TAJARA
+	//	if(gender == MALE)
+	//		hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_male_list)
+	//		facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list)
+	//	else if(gender == FEMALE)
+	//		hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_female_list)
+	//		facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list) // CELADON-EDIT - ORIGINAL
+	if(species_id == "tajara")
+		hairstyle								= sanitize_inlist(hairstyle, GLOB.tajara_hairs_list)
+		facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.tajara_facial_hairs_list)
+		features["grad_style"]				= sanitize_inlist(features["grad_style"], GLOB.hair_gradients_list)
+		features["grad_color"]				= sanitize_hexcolor(features["grad_color"])
+	// [/CELADON-EDIT]	
 	else
-		hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_list)
-		facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list)
-		underwear								= sanitize_inlist(underwear, GLOB.underwear_list)
-		undershirt 								= sanitize_inlist(undershirt, GLOB.undershirt_list)
+		// [CELADON-EDIT] - TAJARA
+		//	hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_list)
+		//	facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list)
+		//	underwear								= sanitize_inlist(underwear, GLOB.underwear_list)
+		//	undershirt 								= sanitize_inlist(undershirt, GLOB.undershirt_list) // CELADON-EDIT - ORIGINAL
+		if(gender == MALE)
+			hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_male_list)
+			facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list)
+		else if(gender == FEMALE)
+			hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_female_list)
+			facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list)
+		else
+			hairstyle								= sanitize_inlist(hairstyle, GLOB.hairstyles_list)
+			facial_hairstyle						= sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list)
+			underwear								= sanitize_inlist(underwear, GLOB.underwear_list)
+			undershirt 								= sanitize_inlist(undershirt, GLOB.undershirt_list)
+		// [/CELADON-EDIT]
+
 
 	socks				= sanitize_inlist(socks, GLOB.socks_list)
 	age					= sanitize_integer(age, pref_species.species_age_min, pref_species.species_age_max, initial(age))