Blame Poojawa for the issue.

code/modules/client/preferences.dm

@@ -677,16 +677,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
 			dat += "<h2>Clothing & Equipment</h2>"
 			dat += "<b>Underwear:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a>"
-			var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[underwear]
-			if(B?.has_color)
+			if(UNDIE_COLORABLE(GLOB.underwear_list[underwear]))
 				dat += "<b>Underwear Color:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=undie_color;task=input'>[undie_color]</a>"
 			dat += "<b>Undershirt:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a>"
-			var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[undershirt]
-			if(T?.has_color)
+			if(UNDIE_COLORABLE(GLOB.undershirt_list[undershirt]))
 				dat += "<b>Undershirt Color:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=shirt_color;task=input'>[shirt_color]</a>"
 			dat += "<b>Socks:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=socks;task=input'>[socks]</a>"
-			var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[socks]
-			if(S?.has_color)
+			if(UNDIE_COLORABLE(GLOB.socks_list[socks]))
 				dat += "<b>Socks Color:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=socks_color;task=input'>[socks_color]</a>"
 			dat += "<b>Backpack:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a>"
 			dat += "<b>Uplink Location:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=uplink_loc;task=input'>[uplink_spawn_loc]</a>"

code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm

@@ -186,6 +186,11 @@
 	name = "Tank top - Sun"
 	icon_state = "tank_sun"
 
+/datum/sprite_accessory/underwear/top/babydoll
+	name = "Baby-Doll"
+	icon_state = "babydoll"
+	has_color = TRUE
+
 /datum/sprite_accessory/underwear/top/bra
 	name = "Bra"
 	icon_state = "bra"

code/modules/mob/dead/new_player/sprite_accessories/underwear.dm

@@ -131,18 +131,14 @@
 	name = "Swimsuit, One Piece - Striped Blue"
 	icon_state = "swimming_blue"
 
-/datum/sprite_accessory/underwear/bottom/swimsuit_green
-	name = "Swimsuit, Bottom - Green"
-	icon_state = "panties_swimming_green"
-
 /datum/sprite_accessory/underwear/bottom/thong
 	name = "Thong"
 	icon_state = "thong"
 	has_color = TRUE
 
 /datum/sprite_accessory/underwear/bottom/thong_babydoll
-	name = "Thong - Babydoll"
-	icon_state = "babydoll"
+	name = "Thong - Alt"
+	icon_state = "thong_babydoll"
 	has_color = TRUE
 
 

code/modules/mob/living/carbon/human/species.dm

@@ -495,11 +495,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(H.hidden_underwear)
 				H.underwear = "Nude"
 			else
-				H.underwear = H.saved_underwear
+				H.saved_underwear = H.underwear
 				var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[H.underwear]
 				if(B)
 					var/mutable_appearance/MA = mutable_appearance(B.icon, B.icon_state, -BODY_LAYER)
-					if(B.has_color)
+					if(UNDIE_COLORABLE(B))
 						MA.color = H.undie_color
 					standing += MA
 
@@ -507,7 +507,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(H.hidden_undershirt)
 				H.undershirt = "Nude"
 			else
-				H.undershirt = H.saved_undershirt
+				H.saved_undershirt = H.undershirt
 				var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[H.undershirt]
 				if(T)
 					var/mutable_appearance/MA
@@ -515,7 +515,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 						MA = wear_female_version(T.icon_state, T.icon, BODY_LAYER)
 					else
 						MA = mutable_appearance(T.icon, T.icon_state, -BODY_LAYER)
-					if(T.has_color)
+					if(UNDIE_COLORABLE(T))
 						MA.color = H.shirt_color
 					standing += MA
 
@@ -523,12 +523,12 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(H.hidden_socks)
 				H.socks = "Nude"
 			else
-				H.socks = H.saved_socks
+				H.saved_socks = H.socks
 				var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks]
 				if(S)
 					var/digilegs = (DIGITIGRADE in species_traits) ? "_d" : ""
-					var/mutable_appearance/MA = mutable_appearance(S.icon, "[S][digilegs]", -BODY_LAYER)
-					if(S.has_color)
+					var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER)
+					if(UNDIE_COLORABLE(S))
 						MA.color = H.socks_color
 					standing += MA