Fixes errors

code/_helpers/global_lists.dm

@@ -46,21 +46,18 @@ var/global/list/facial_hair_styles_male_list = list()
 var/global/list/facial_hair_styles_female_list = list()
 var/global/list/skin_styles_female_list = list()		//unused
 	//Underwear
-var/global/list/underwear_m = list(
+var/global/list/underwear_top_t = list(
-	"White" = "m1", "Grey" = "m2", "Green" = "m3", "Blue" = "m4", "Black" = "m5", "Mankini" = "m6",
+	"Bra, Red" = "t1", "Bra, White" = "t2", "Bra, Yellow" = "t3", "Bra, Blue" = "t4", "Bra, Black" = "t5", "Lacy Bra" = "t6", "Sports Bra, Black" = "t7", "Sports Bra, White" = "t8",
-	"Boxers Heart" = "m7", "Boxers Black" = "m8", "Boxers Grey" = "m9", "Boxers Stripe" = "m10", "None") //Curse whoever made male/female underwear diffrent colours
+	"Sports Bra Alt, Black" = "t9", "Sporta Bra Alt, White" = "t10", "Lacy Bra, Baby-Blue" = "t11", "Lacy Bra, Green" = "t12", "Lacy Bra, Pink" = "t13", "Lacy Bra, Violet" = "t14",
-var/global/list/underwear_f = list(
+	"Lacy Bra Alt" = "t15", "Lacy Bra Alt, Violet" = "t16", "Halterneck Bra, Black" = "t17", "Halterneck Bra, Blue" = "t18", "Halterneck Bra, Green" = "t19", "Halterneck Bra, Purple" = "t20",
-	"Red" = "f1", "White" = "f2", "Yellow" = "f3", "Blue" = "f4", "Black" = "f5", "Thong" = "f6",
+	"Halterneck Bra, Red" = "t21", "Halterneck Bra, Teal" = "t22", "Halterneck Bra, Violet" = "t23", "Halterneck Bra, White" = "t24", "None")
-	"Black Sports" = "f7","White Sports" = "f8", "Black Sports Alt" = "f9", "White Sports Alt" = "f10", "Baby Blue" = "f11", "Green" = "f12", "Pink" = "f13",
+var/global/list/underwear_bottom_t = list(
-	 "Violet" = "f14", "Thong Alt" = "f15", "Thong Alt Violet" = "f16", "None")
+	"Briefs, White" = "b1", "Briefs, Grey" = "b2", "Briefs, Green" = "b3", "Briefs, Blue" = "b4", "Briefs, Black" = "b5", "Boxers, Loveheart" = "b7", "Boxers, Black" = "b8",
-var/global/list/underwear_top = list(
+	"Boxers, Grey" = "b9", "Boxers, Green & Blue Striped" = "b10", "Panties, Red" = "b11", "Panties, White" = "b12", "Panties, Yellow" = "b13", "Panties, Blue" = "b14",
-	"Red" = "f1", "White" = "f2", "Yellow" = "f3", "Blue" = "f4", "Black" = "f5", "Thong" = "f6",
+	"Panties, Light-Black" = "b15", "Thong" = "b16", "Panties, Black" = "b17", "Panties Alt, White" = "b18", "Compression Shorts, Black" = "b19", "Compression Shorts, White" = "b20",
-	"Black Sports" = "f7","White Sports" = "f8", "Black Sports Alt" = "f9", "White Sports Alt" = "f10", "Baby Blue" = "f11", "Green" = "f12", "Pink" = "f13",
+	"Compression Shorts, Baby-Blue" = "b21", "Panties, Green" = "b22", "Compression Shorts, Pink" = "b23", "Thong, Violet" = "b24", "Thong Alt" = "b25", "Thong Alt, Violet" = "b26",
-	 "Violet" = "f14", "Thong Alt" = "f15", "Thong Alt Violet" = "f16", "None")
+	"Alt Thong, Black" = "b27", "Alt Thong, Blue" = "b28", "Alt Thong, Green" = "b29", "Alt Thong, Purple" = "b30", "Alt Thong, Red" = "b31", "Alt Thong, Teal" = "b32",
-var/global/list/underwear_bottom = list(
+	"Alt Thong, Violet" = "b33", "Alt Thong, White" = "b34", "None")
-	"Red" = "f1", "White" = "f2", "Yellow" = "f3", "Blue" = "f4", "Black" = "f5", "Thong" = "f6",
-	"Black Sports" = "f7","White Sports" = "f8", "Black Sports Alt" = "f9", "White Sports Alt" = "f10", "Baby Blue" = "f11", "Green" = "f12", "Pink" = "f13",
-	 "Violet" = "f14", "Thong Alt" = "f15", "Thong Alt Violet" = "f16", "None")
 	//undershirt
 var/global/list/undershirt_t = list(
 	"White tank top" = "u1", "Black tank top" = "u2", "Black shirt" = "u3",

code/game/objects/structures/under_wardrobe.dm

@@ -12,16 +12,13 @@
 		user << "<span class='warning'>Sadly there's nothing in here for you to wear.</span>"
 		return 0
 
-	var/utype = alert("Which section do you want to pick from?",,"Underwear", "Undershirts", "Socks",)
+	var/utype = alert("Which section do you want to pick from?",,"Top Underwear", "Bottom Underwear", "Undershirts", "Socks",)
 	var/list/selection
 	switch(utype)
-		if("Underwear")
+		if("Top Underwear")
-			var/utype2 = alert("Which section do you want to pick from?",,"Male", "Female")
+			selection = underwear_top_t
-			switch(utype2)
+		if("Bottom Underwear")
-				if("Male")
+			selection = underwear_bottom_t
-					selection = underwear_m
-				if("Female")
-					selection = underwear_f
 		if("Undershirts")
 			selection = undershirt_t
 		if("Socks")
@@ -34,8 +31,9 @@
 			H.undershirt = selection[pick]
 		else if(utype == "Socks")
 			H.socks = selection[pick]
-		else
+		else if(utype == "Top Underwear")
 			H.underwear_top = selection[pick]
+		else
 			H.underwear_bottom = selection[pick]
 		H.update_body(1)
 

code/modules/client/preference_setup/general/04_equipment.dm

@@ -45,9 +45,9 @@
 	. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
 
 /datum/category_item/player_setup_item/general/equipment/proc/get_undies_top()
-	return underwear_top
+	return underwear_top_t
 /datum/category_item/player_setup_item/general/equipment/proc/get_undies_bottom()
-	return underwear_bottom
+	return underwear_bottom_t
 
 /datum/category_item/player_setup_item/general/equipment/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["change_underwear_top"])

code/modules/mob/new_player/preferences_setup.dm

@@ -12,8 +12,8 @@ datum/preferences
 			if(current_species.flags & HAS_SKIN_COLOR)
 				randomize_skin_color()
 			if(current_species.flags & HAS_UNDERWEAR)
-				underwear_top = rand(1,underwear_top.len)
+				underwear_top = rand(1,underwear_top_t.len)
-				underwear_bottom = rand(1,underwear_bottom.len)
+				underwear_bottom = rand(1,underwear_bottom_t.len)
 				undershirt = rand(1,undershirt_t.len)