Merge pull request #1400 from haha26315/Ass-Color-Save-Fix

Fix buttcolor saving.

code/modules/client/preferences_savefile.dm

@@ -409,10 +409,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_cock_length"]			>> features["cock_length"]
 	S["feature_cock_girth"]				>> features["cock_girth"]
 	S["feature_has_sheath"]				>> features["sheath_color"]
-	//belly size
-	S["feature_belly_size"]				>> features["belly_size"]
-	//belly size
-	S["feature_butt_size"]				>> features["butt_size"]
 	//balls features
 	S["feature_has_balls"]				>> features["has_balls"]
 	S["feature_balls_color"]			>> features["balls_color"]
@@ -436,12 +432,14 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_can_get_preg"]			>> features["can_get_preg"] //hyperstation 13
 	//belly features
 	S["feature_has_belly"]				>> features["has_belly"]
+	S["feature_belly_size"]				>> features["belly_size"]
 	S["feature_belly_color"]			>> features["belly_color"]
 	S["feature_hide_belly"]				>> features["hide_belly"]
 	S["feature_inflatable_belly"]		>> features["inflatable_belly"]
-	//anus features
-	S["feature_has_anus"]				>> features["has_anus"]
+	//butt features
+	S["feature_butt_size"]				>> features["butt_size"]
 	S["feature_butt_color"]				>> features["butt_color"]
+	S["feature_has_anus"]				>> features["has_anus"]
 
 	//flavor text
 	//Let's make our players NOT cry desperately as we wipe their savefiles of their special snowflake texts:

modular_citadel/code/modules/arousal/organs/genitals.dm

@@ -255,9 +255,13 @@
 			A.size = dna.features["butt_size"]
 		A.Insert(src)
 		if(A)
-			A.color = "#[skintone2hex(skin_tone)]"
+			if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
+				A.color = "#[skintone2hex(skin_tone)]"
+			else
+				A.color = "#[dna.features["butt_color"]]"
 			A.update()
 
+
 /mob/living/carbon/human/proc/give_breasts()
 	if(!dna)
 		return FALSE

modular_citadel/code/modules/client/preferences_savefile.dm

@@ -61,10 +61,6 @@
 	WRITE_FILE(S["feature_cock_length"], features["cock_length"])
 	WRITE_FILE(S["feature_cock_girth"], features["cock_girth"])
 	WRITE_FILE(S["feature_has_sheath"], features["sheath_color"])
-	//belly feature
-	WRITE_FILE(S["feature_belly_size"], features["belly_size"])
-	//butt feature
-	WRITE_FILE(S["feature_butt_size"], features["butt_size"])
 	//balls features
 	WRITE_FILE(S["feature_has_balls"], features["has_balls"])
 	WRITE_FILE(S["feature_balls_color"], features["balls_color"])
@@ -93,13 +89,17 @@
 	WRITE_FILE(S["feature_ooc_text"], features["ooc_text"])
 	//custom job titles
 	WRITE_FILE(S["alt_titles_preferences"], alt_titles_preferences)
-	//belly
+	//belly features
 	WRITE_FILE(S["feature_has_belly"], features["has_belly"])
+	WRITE_FILE(S["feature_belly_size"], features["belly_size"])
 	WRITE_FILE(S["feature_belly_color"], features["belly_color"])
 	WRITE_FILE(S["feature_hide_belly"], features["hide_belly"])
 	WRITE_FILE(S["feature_inflatable_belly"], features["inflatable_belly"])
-	//anus
+	//butt features
 	WRITE_FILE(S["feature_has_anus"], features["has_anus"])
+	WRITE_FILE(S["feature_butt_size"], features["butt_size"])
+	WRITE_FILE(S["feature_butt_color"], features["butt_color"])
+
 
 	//gear loadout
 	if(islist(chosen_gear))

tgstation.dme

@@ -3392,4 +3392,4 @@
 #include "modular_citadel\code\modules\vore\eating\vorepanel_vr.dm"
 #include "modular_citadel\interface\skin.dmf"
 #include "yogstation\code\modules\power\energyharvester.dm"
-// END_INCLUDE
+// END_INCLUDE