TG:Partial r3307 update. You can now pick your underwear and backpack preferences.

Commit for Nodrak.
See: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8107#p96230 for
changelist.
Revision: r3307
Author: 	 petethegoat

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

@@ -1471,8 +1471,8 @@
 		stand_icon.Blend(rgb(100,100,100))
 		lying_icon.Blend(rgb(100,100,100))
 
-	if (underwear > 0)
-		//if(!obese)
+	if (underwear < 6 && underwear > 0)
+//		if(!obese)
 		stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
 		lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
 

code/modules/mob/mob_defines.dm

@@ -29,6 +29,7 @@
 	var/maxHealth = 100 //Living
 	//Vars that should only be accessed via procs ++END
 
+
 //	var/uses_hud = 0
 	var/obj/screen/pain = null
 	var/obj/screen/flash = null
@@ -127,6 +128,7 @@
 	var/jitteriness = 0//Carbon
 	var/charges = 0.0
 	var/nutrition = 400.0//Carbon
+
 	var/overeatduration = 0		// How long this guy is overeating //Carbon
 	var/paralysis = 0.0
 	var/stunned = 0.0
@@ -252,6 +254,7 @@
 	var/robot_talk_understand = 0
 	var/alien_talk_understand = 0
 	var/taj_talk_understand = 0
+
 	//You can guess what these are for.  --SkyMarshal
 	var/list/atom/hallucinations = list()
 	var/halloss = 0

code/modules/mob/new_player/preferences.dm

@@ -67,6 +67,10 @@ datum/preferences
 		//Just like it sounds
 		ooccolor = "#b82e00"
 		underwear = 1
+		list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours
+		list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None")
+		backbag = 2
+		list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt")
 
 		//Hair type
 		h_style = "Short Hair"
@@ -252,13 +256,18 @@ datum/preferences
 		dat += "\t<a href=\"byond://?src=\ref[user];preferences=1;skills=1\"><b>Set Skills</b></a><br>"
 
 		dat += "<hr><table><tr><td><b>Body</b> "
-		dat += "(<a href=\"byond://?src=\ref[user];preferences=1;s_tone=random;underwear=random;age=random;b_type=random;hair=random;h_style=random;facial=random;f_style=random;eyes=random\">&reg;</A>)" // Random look
+		dat += "(<a href=\"byond://?src=\ref[user];preferences=1;s_tone=random;underwear=random;backbag_type=random;age=random;b_type=random;hair=random;h_style=random;facial=random;f_style=random;eyes=random\">&reg;</A>)" // Random look
 		dat += "<br>"
 		dat += "Blood Type: <a href='byond://?src=\ref[user];preferences=1;b_type=input'>[b_type]</a><br>"
 		dat += "Skin Tone: <a href='byond://?src=\ref[user];preferences=1;s_tone=input'>[-s_tone + 35]/220<br></a>"
 
-		if(!IsGuestKey(user.key))
-			dat += "Underwear: <a href =\"byond://?src=\ref[user];preferences=1;underwear=1\"><b>[underwear == 1 ? "Yes" : "No"]</b></a><br>"
+	//	if(!IsGuestKey(user.key))//Seeing as it doesn't do anything, it may as well not show up.
+		if(gender == MALE)
+			dat += "Underwear: <a href =\"byond://?src=\ref[user];preferences=1;underwear=inputmale\"><b>[underwear_m[underwear]]</b></a><br>"
+		else
+			dat += "Underwear: <a href =\"byond://?src=\ref[user];preferences=1;underwear=inputfemale\"><b>[underwear_f[underwear]]</b></a><br>"
+
+		dat += "Backpack Type:<br><a href =\"byond://?src=\ref[user];preferences=1;backbag_type=input\"><b>[backbaglist[backbag]]</b></a><br>"
 
 		dat += "</td><td style='text-align:center;padding-left:2em'><b>Preview</b><br>"
 		dat += "<a href='?src=\ref[user];preferences=1;preview_dir=[turn(preview_dir,-90)]'>&lt;</a>"
@@ -401,7 +410,10 @@ datum/preferences
 				HTML += " <font color=orange>\[Low]</font>"
 			else
 				HTML += " <font color=red>\[NEVER]</font>"
-			HTML += "</a></td></tr>"
+			if(job.alt_titles)
+				HTML += "</a> <a href=\"byond://?src=\ref[user];preferences=1;alt_title=1;job=\ref[job]\">\[[GetAltTitle(job)]\]</a></td></tr>"
+			else
+				HTML += "</a></td></tr>"
 
 		HTML += "</table><br>"
 		HTML += "<a href=\"byond://?src=\ref[user];preferences=1;occ=0;job=cancel\">\[Done\]</a>"
@@ -754,19 +766,30 @@ datum/preferences
 			ghost_ears = !ghost_ears
 
 		if(link_tags["underwear"])
-			if(!IsGuestKey(user.key))
-				/*switch(link_tags["underwear"])
-					if("random")
-						if(prob (75))
-							underwear = 1
-						else
-							underwear = 0
-					if("input")
-						if(underwear == 1)
-							underwear = 0
-						else
-							underwear = 1*/
-				underwear = !underwear
+			switch(link_tags["underwear"])
+				if("inputmale")
+					var/tempUnderwear = input(user, "Please select your underwear colour:", "Character Generation")  as null|anything in underwear_m
+					if(tempUnderwear)
+						underwear = underwear_m.Find(tempUnderwear)
+				if("inputfemale")
+					var/tempUnderwear = input(user, "Please select your underwear colour:", "Character Generation")  as null|anything in underwear_f
+					if(tempUnderwear)
+						underwear = underwear_f.Find(tempUnderwear)
+				if("random")
+					if(prob (75))
+						underwear = pick(1,2,3,4,5)
+					else
+						underwear = 6
+
+		if(link_tags["backbag_type"])
+			switch(link_tags["backbag_type"])
+				if("input")
+					var/tempBag = input(user, "Please pick a backpack type:", "Character Generation")  as null|anything in backbaglist
+					if(tempBag)
+						backbag = backbaglist.Find(tempBag)
+				if("random")
+					backbag = pick(1,2,3)
+
 
 		if(link_tags["be_special"])
 			src.be_special^=(1<<text2num(link_tags["be_special"])) //bitwize magic, sorry for that. --rastaf0
@@ -846,6 +869,7 @@ datum/preferences
 			job_engsec_low = 0
 			job_alt_titles = new()
 			underwear = 1
+			backbag = 2
 			be_special = 0
 			be_random_name = 0
 			r_hair = 0.0
@@ -915,6 +939,14 @@ datum/preferences
 		character.hair_style = hair_style
 		character.facial_hair_style = facial_hair_style
 
+		if(underwear > 6 || underwear < 1)
+			underwear = 1 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me.
+		character.underwear = underwear
+
+		if(backbag > 4 || backbag < 1)
+			backbag = 1 //Same as above
+		character.backbag = backbag
+
 		character.underwear = underwear == 1 ? pick(1,2,3,4,5) : 0
 
 		character.used_skillpoints = used_skillpoints

code/modules/mob/new_player/preferences_setup.dm

@@ -13,6 +13,7 @@ datum/preferences
 			randomize_hair_color("facial")
 		randomize_eyes_color()
 		underwear = 1
+		backbag = 2
 		b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
 		age = rand(19,35)
 		copy_to(H,1)
@@ -216,7 +217,7 @@ datum/preferences
 		else
 			preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 
-		if (underwear > 0)
+		if (underwear < 6)
 			preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s", "dir" = preview_dir), ICON_OVERLAY)
 
 		var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s", "dir" = preview_dir)

code/modules/mob/new_player/savefile.dm

@@ -132,6 +132,10 @@ datum/preferences/proc/savefile_save(mob/user, slot)
 	F["eyes_blue"] << src.b_eyes
 	F["blood_type"] << src.b_type
 	F["underwear"] << src.underwear
+	F["backbag"] << src.backbag
+	F["backbag"] << src.backbag
+
+
 
 	F["be_special"] << src.be_special
 	F["UI"] << src.UI
@@ -200,6 +204,9 @@ datum/preferences/proc/savefile_load(mob/user, slot)
 	F["eyes_blue"] >> src.b_eyes
 	F["blood_type"] >> src.b_type
 	F["underwear"] >> src.underwear
+	if(underwear == 0) underwear = 6 //For old players who have 0 in their savefile
+	F["backbag"] >> src.backbag
+	if(isnull(backbag)) backbag = 2
 	F["name_is_always_random"] >> src.be_random_name
 	F["midis"] >> src.midis
 	F["ghost_ears"] >> src.ghost_ears