Merge pull request #1166 from Yoshax/splitundie

Splits underwear into top underwear and bottom underwear

code/_helpers/global_lists.dm

@@ -46,14 +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", "Bra, Baby-Blue" = "t11", "Bra, Green" = "t12", "Bra, Pink" = "t13", "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", "Halterneck Black" = "f17", "Halterneck Blue" = "f18", "Halterneck Green" = "f19", "Halterneck Purple" = "f20",
+	"Briefs, White" = "b1", "Briefs, Grey" = "b2", "Briefs, Green" = "b3", "Briefs, Blue" = "b4", "Briefs, Black" = "b5", "Boxers, Loveheart" = "b7", "Boxers, Black" = "b8",
-	 "Halterneck Red" = "f21", "Halterneck Teal" = "f22", "Halterneck Violet" = "f23", "Halterneck White" = "14")
+	"Boxers, Grey" = "b9", "Boxers, Green & Blue Striped" = "b10", "Panties, Red" = "b11", "Panties, White" = "b12", "Panties, Yellow" = "b13", "Panties, Blue" = "b14",
+	"Panties, Light-Black" = "b15", "Thong" = "b16", "Panties, Black" = "b17", "Panties Alt, White" = "b18", "Compression Shorts, Black" = "b19", "Compression Shorts, White" = "b20",
+	"Compression Shorts, Baby-Blue" = "b21", "Panties, Green" = "b22", "Compression Shorts, Pink" = "b23", "Thong, Violet" = "b24", "Thong Alt" = "b25", "Thong Alt, Violet" = "b26",
+	"Alt Thong, Black" = "b27", "Alt Thong, Blue" = "b28", "Alt Thong, Green" = "b29", "Alt Thong, Purple" = "b30", "Alt Thong, Red" = "b31", "Alt Thong, Teal" = "b32",
+	"Alt Thong, Violet" = "b33", "Alt Thong, White" = "b34", "None")
 	//undershirt
 var/global/list/undershirt_t = list(
 	"White tank top" = "u1", "Black tank top" = "u2", "Black shirt" = "u3",

code/_onclick/hud/human.dm

@@ -388,7 +388,8 @@
 	if(dna.species == "Human") //no more xenos losing ears/tentacles
 		h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
 	undershirt = null
-	underwear = null
+	underwear_top = null
+	underwear_bottom = null
 	socks = null
 	regenerate_icons()
 

code/game/gamemodes/cult/runes.dm

@@ -468,7 +468,8 @@ var/list/sacrificed = list()
 			D.r_eyes = 200
 			D.g_eyes = 200
 			D.update_eyes()
-			D.underwear = 0
+			D.underwear_top = 0
+			D.underwear_bottom = 0
 			D.key = ghost.key
 			cult.add_antagonist(D.mind)
 

code/game/objects/structures/under_wardrobe.dm

@@ -16,12 +16,12 @@
 	var/list/selection
 	switch(utype)
 		if("Underwear")
-			var/utype2 = alert("Which section do you want to pick from?",,"Male", "Female")
+			utype = alert("Which section do you want to pick from?",, "Top", "Bottom",)
-			switch(utype2)
+			switch(utype)
-				if("Male")
+				if("Top")
-					selection = underwear_m
+					selection = underwear_top_t
-				if("Female")
+				if("Bottom")
-					selection = underwear_f
+					selection = underwear_bottom_t
 		if("Undershirts")
 			selection = undershirt_t
 		if("Socks")
@@ -34,8 +34,10 @@
 			H.undershirt = selection[pick]
 		else if(utype == "Socks")
 			H.socks = selection[pick]
+		else if(utype == "Top")
+			H.underwear_top = selection[pick]
 		else
-			H.underwear = selection[pick]
+			H.underwear_bottom = selection[pick]
 		H.update_body(1)
 
 	return 1

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

@@ -3,14 +3,16 @@
 	sort_order = 4
 
 /datum/category_item/player_setup_item/general/equipment/load_character(var/savefile/S)
-	S["underwear"]	>> pref.underwear
+	S["underwear_top"]	>> pref.underwear_top
+	S["underwear_bottom"]	>> pref.underwear_bottom
 	S["undershirt"]	>> pref.undershirt
 	S["socks"]		>> pref.socks
 	S["backbag"]	>> pref.backbag
 	S["pdachoice"]	>> pref.pdachoice
 
 /datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
-	S["underwear"]	<< pref.underwear
+	S["underwear_top"]	<< pref.underwear_top
+	S["underwear_bottom"] << pref.underwear_bottom
 	S["undershirt"]	<< pref.undershirt
 	S["socks"]		<< pref.socks
 	S["backbag"]	<< pref.backbag
@@ -22,9 +24,12 @@
 
 	if(!islist(pref.gear)) pref.gear = list()
 
-	var/undies = get_undies()
+	var/undies_top = get_undies_top()
-	if(!get_key_by_value(undies, pref.underwear))
+	var/undies_bottom = get_undies_bottom()
-		pref.underwear = undies[1]
+	if(!get_key_by_value(undies_top, pref.underwear_top))
+		pref.underwear_top = undies_top[1]
+	if(!get_key_by_value(undies_bottom, pref.underwear_bottom))
+		pref.underwear_bottom = undies_bottom[1]
 	if(!get_key_by_value(undershirt_t, pref.undershirt))
 		pref.undershirt = undershirt_t[1]
 	if(!get_key_by_value(socks_t, pref.socks))
@@ -32,21 +37,31 @@
 
 /datum/category_item/player_setup_item/general/equipment/content()
 	. += "<b>Equipment:</b><br>"
-	. += "Underwear: <a href='?src=\ref[src];change_underwear=1'><b>[get_key_by_value(get_undies(),pref.underwear)]</b></a><br>"
+	. += "Underwear Top: <a href='?src=\ref[src];change_underwear_top=1'><b>[get_key_by_value(get_undies_top(),pref.underwear_top)]</b></a><br>"
+	. += "Underwear Bottom: <a href='?src=\ref[src];change_underwear_bottom=1'><b>[get_key_by_value(get_undies_bottom(),pref.underwear_bottom)]</b></a><br>"
 	. += "Undershirt: <a href='?src=\ref[src];change_undershirt=1'><b>[get_key_by_value(undershirt_t,pref.undershirt)]</b></a><br>"
 	. += "Socks: <a href='?src=\ref[src];change_socks=1'><b>[get_key_by_value(socks_t,pref.socks)]</b></a><br>"
 	. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
 	. += "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()
+/datum/category_item/player_setup_item/general/equipment/proc/get_undies_top()
-	return pref.gender == MALE ? underwear_m : underwear_f
+	return underwear_top_t
+/datum/category_item/player_setup_item/general/equipment/proc/get_undies_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"])
+	if(href_list["change_underwear_top"])
-		var/underwear_options = get_undies()
+		var/underwear_top_options = get_undies_top()
-		var/new_underwear = input(user, "Choose your character's underwear:", "Character Preference", get_key_by_value(get_undies(),pref.underwear)) as null|anything in underwear_options
+		var/new_underwear_top = input(user, "Choose your character's top underwear:", "Character Preference", get_key_by_value(get_undies_top(),pref.underwear_top)) as null|anything in underwear_top_options
-		if(!isnull(new_underwear) && CanUseTopic(user))
+		if(!isnull(new_underwear_top) && CanUseTopic(user))
-			pref.underwear = underwear_options[new_underwear]
+			pref.underwear_top = underwear_top_options[new_underwear_top]
+			return TOPIC_REFRESH
+
+	else if(href_list["change_underwear_bottom"])
+		var/underwear_bottom_options = get_undies_bottom()
+		var/new_underwear_bottom = input(user, "Choose your character's bottom underwear:", "Character Preference", get_key_by_value(get_undies_bottom(),pref.underwear_bottom)) as null|anything in underwear_bottom_options
+		if(!isnull(new_underwear_bottom) && CanUseTopic(user))
+			pref.underwear_bottom = underwear_bottom_options[new_underwear_bottom]
 			return TOPIC_REFRESH
 
 	else if(href_list["change_undershirt"])

code/modules/client/preferences.dm

@@ -30,7 +30,8 @@ datum/preferences
 	var/age = 30						//age of character
 	var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
 	var/b_type = "A+"					//blood type (not-chooseable)
-	var/underwear						//underwear type
+	var/underwear_top
+	var/underwear_bottom
 	var/undershirt						//undershirt type
 	var/socks							//socks type
 	var/backbag = 2						//backpack type
@@ -333,7 +334,8 @@ datum/preferences
 			else if(status == "mechanical")
 				I.robotize()
 
-	character.underwear = underwear
+	character.underwear_bottom = underwear_bottom
+	character.underwear_top = underwear_top
 	character.undershirt = undershirt
 	character.socks = socks
 

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

@@ -32,7 +32,8 @@
 	var/age = 30		//Player's age (pure fluff)
 	var/b_type = "A+"	//Player's bloodtype
 
-	var/underwear = 1	//Which underwear the player wants
+	var/underwear_top = 1	//Which underwear the player wants
+	var/underwear_bottom = 1
 	var/undershirt = 0	//Which undershirt the player wants.
 	var/socks = 0		//Which socks the player wants.
 	var/backbag = 2		//Which backpack type the player has chosen. Nothing, Satchel or Backpack.

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

@@ -320,8 +320,10 @@ var/global/list/damage_icon_parts = list()
 	stand_icon.Blend(base_icon,ICON_OVERLAY)
 
 	//Underwear
-	if(underwear && species.appearance_flags & HAS_UNDERWEAR)
+	if(underwear_top && species.appearance_flags & HAS_UNDERWEAR)
-		stand_icon.Blend(new /icon('icons/mob/human.dmi', underwear), ICON_OVERLAY)
+		stand_icon.Blend(new /icon('icons/mob/human.dmi', underwear_top), ICON_OVERLAY)
+	if(underwear_bottom && species.appearance_flags & HAS_UNDERWEAR)
+		stand_icon.Blend(new /icon('icons/mob/human.dmi', underwear_bottom), ICON_OVERLAY)
 
 	if(undershirt && species.appearance_flags & HAS_UNDERWEAR)
 		stand_icon.Blend(new /icon('icons/mob/human.dmi', undershirt), ICON_OVERLAY)

code/modules/mob/new_player/preferences_setup.dm

@@ -12,7 +12,8 @@ datum/preferences
 			if(current_species.flags & HAS_SKIN_COLOR)
 				randomize_skin_color()
 			if(current_species.flags & HAS_UNDERWEAR)
-				underwear = rand(1,underwear_m.len)
+				underwear_top = rand(1,underwear_top_t.len)
+				underwear_bottom = rand(1,underwear_bottom_t.len)
 				undershirt = rand(1,undershirt_t.len)
 
 
@@ -278,9 +279,12 @@ datum/preferences
 			facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
 			eyes_s.Blend(facial_s, ICON_OVERLAY)
 
-		var/icon/underwear_s = null
+		var/icon/underwear_top_s = null
-		if(underwear && current_species.appearance_flags & HAS_UNDERWEAR)
+		if(underwear_top && current_species.appearance_flags & HAS_UNDERWEAR)
-			underwear_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = underwear)
+			underwear_top_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = underwear_top)
+		var/icon/underwear_bottom_s = null
+		if(underwear_bottom && current_species.appearance_flags & HAS_UNDERWEAR)
+			underwear_bottom_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = underwear_bottom)
 
 		var/icon/undershirt_s = null
 		if(undershirt && current_species.appearance_flags & HAS_UNDERWEAR)
@@ -723,8 +727,10 @@ datum/preferences
 			preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
 
 		preview_icon.Blend(eyes_s, ICON_OVERLAY)
-		if(underwear_s)
+		if(underwear_top_s)
-			preview_icon.Blend(underwear_s, ICON_OVERLAY)
+			preview_icon.Blend(underwear_top_s, ICON_OVERLAY)
+		if(underwear_bottom_s)
+			preview_icon.Blend(underwear_bottom_s, ICON_OVERLAY)
 		if(undershirt_s)
 			preview_icon.Blend(undershirt_s, ICON_OVERLAY)
 		if(socks_s)
@@ -735,7 +741,8 @@ datum/preferences
 		preview_icon_side = new(preview_icon, dir = WEST)
 
 		qdel(eyes_s)
-		qdel(underwear_s)
+		qdel(underwear_top_s)
+		qdel(underwear_bottom_s)
 		qdel(undershirt_s)
 		qdel(socks_s)
 		qdel(clothes_s)