Adds socks.

Conflicts:
	code/modules/client/preferences_savefile.dm

code/modules/client/preferences.dm

@@ -57,6 +57,7 @@ datum/preferences
 	var/b_type = "A+"					//blood type (not-chooseable)
 	var/underwear						//underwear type
 	var/undershirt						//undershirt type
+	var/socks							//socks type
 	var/backbag = 2						//backpack type
 	var/h_style = "Bald"				//Hair type
 	var/r_hair = 0						//Hair color
@@ -413,6 +414,8 @@ datum/preferences
 
 	dat += "Undershirt: <a href='?_src_=prefs;preference=undershirt;task=input'><b>[get_key_by_value(undershirt_t,undershirt)]</b></a><br>"
 
+	dat += "Socks: <a href='?_src_=prefs;preference=socks;task=input'><b>[get_key_by_value(socks_t,socks)]</b></a><br>"
+
 	dat += "Backpack Type:<br><a href ='?_src_=prefs;preference=bag;task=input'><b>[backbaglist[backbag]]</b></a><br>"
 
 	dat += "[company_name] Relation:<br><a href ='?_src_=prefs;preference=nt_relation;task=input'><b>[nanotrasen_relation]</b></a><br>"
@@ -1239,6 +1242,10 @@ datum/preferences
 					var/r = pick(undershirt_t)
 					undershirt = undershirt_t[r]
 					ShowChoices(user)
+				if("socks")
+					var/r = pick(socks_t)
+					socks = socks_t[r]
+					ShowChoices(user)
 				if("eyes")
 					r_eyes = rand(0,255)
 					g_eyes = rand(0,255)
@@ -1397,6 +1404,15 @@ datum/preferences
 						undershirt = undershirt_options[new_undershirt]
 					ShowChoices(user)
 
+				if("socks")
+					var/list/socks_options
+					socks_options = socks_t
+
+					var/new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_options
+					if (new_socks)
+						socks = socks_options[new_socks]
+					ShowChoices(user)
+
 				if("eyes")
 					var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", rgb(r_eyes, g_eyes, b_eyes)) as color|null
 					if(new_eyes)
@@ -1771,6 +1787,8 @@ datum/preferences
 
 	character.undershirt = undershirt
 
+	character.socks = socks
+
 	if(backbag > 4 || backbag < 1)
 		backbag = 1 //Same as above
 	character.backbag = backbag

code/modules/client/preferences_savefile.dm

@@ -152,6 +152,7 @@
 	S["eyes_blue"]			>> b_eyes
 	S["underwear"]			>> underwear
 	S["undershirt"]			>> undershirt
+	S["socks"]				>> socks
 	S["backbag"]			>> backbag
 	S["b_type"]				>> b_type
 
@@ -224,6 +225,10 @@
 	if(isnum(undershirt))
 		undershirt = undershirt_t[undershirt_t[undershirt]]
 
+	if(isnum(socks))
+		socks = socks_t[socks_t[socks]]
+
+	if(isnull(language)) language = "None"
 	if(isnull(alternate_languages)) alternate_languages = list()
 	if(isnull(spawnpoint)) spawnpoint = "Arrivals Shuttle"
 	if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation)
@@ -308,6 +313,7 @@
 	S["eyes_blue"]			<< b_eyes
 	S["underwear"]			<< underwear
 	S["undershirt"]			<< undershirt
+	S["socks"]				<< socks
 	S["backbag"]			<< backbag
 	S["b_type"]				<< b_type
 	S["spawnpoint"]			<< spawnpoint