Merging work into dev.

code/modules/client/preferences.dm

@@ -73,8 +73,9 @@ datum/preferences
 	var/r_eyes = 0						//Eye color
 	var/g_eyes = 0						//Eye color
 	var/b_eyes = 0						//Eye color
-	var/species = "Human"
+	var/species = "Human"               //Species datum to use.
 	var/language = "None"				//Secondary language
+	var/list/gear						//Custom/fluff item loadout.
 
 		//Mob preview
 	var/icon/preview_icon = null
@@ -104,7 +105,6 @@ datum/preferences
 	// maps each organ to either null(intact), "cyborg" or "amputated"
 	// will probably not be able to do this for head and torso ;)
 	var/list/organ_data = list()
-
 	var/list/player_alt_titles = new()		// the default name of a job like "Medical Doctor"
 
 	var/flavor_text = ""
@@ -132,6 +132,8 @@ datum/preferences
 	gender = pick(MALE, FEMALE)
 	real_name = random_name(gender)
 
+	gear = list()
+
 /datum/preferences
 	proc/ZeroSkills(var/forced = 0)
 		for(var/V in SKILLS) for(var/datum/skill/S in SKILLS[V])
@@ -340,6 +342,22 @@ datum/preferences
 		else
 			dat += "<br><br>"
 
+		dat += "<b>Custom Loadout:</b> "
+		var/total_cost = 0
+		if(gear && gear.len)
+			dat += "<br>"
+			for(var/gear_name in gear)
+				if(gear_datums[gear_name])
+					var/datum/gear/G = gear_datums[gear_name]
+					total_cost += G.cost
+					dat += "[gear_name] ([G.cost]) "
+					dat += "<a href='byond://?src=\ref[user];preference=loadout;task=remove;gear=[gear_name]'>\[remove\]</a><br>"
+			if(total_cost < MAX_GEAR_COST)
+				dat += "<a href='byond://?src=\ref[user];preference=loadout;task=input'>\[add\]</a><br>"
+			dat += "<b>Used:</b> [total_cost] points.<br>"
+		else
+			dat += "none.<br>"
+
 		if(gender == MALE)
 			dat += "Underwear: <a href ='?_src_=prefs;preference=underwear;task=input'><b>[underwear_m[underwear]]</b></a><br>"
 		else
@@ -835,6 +853,22 @@ datum/preferences
 				ShowChoices(user)
 			return 1
 
+		else if (href_list["preference"] == "loadout")
+
+			if(href_list["task"] == "input")
+
+				var/choice = input("Select gear to add.") as null|anything in gear_datums
+				if(choice && gear_datums[choice])
+					gear += choice
+
+			else if(href_list["task"] == "remove")
+				var/to_remove = href_list["gear"]
+				if(!to_remove) return
+				for(var/gear_name in gear)
+					if(gear_name == to_remove)
+						gear -= gear_name
+						break
+
 		switch(href_list["task"])
 			if("random")
 				switch(href_list["preference"])

code/modules/client/preferences_gear.dm

@@ -0,0 +1,131 @@
+var/global/list/gear_datums = list()
+
+proc/populate_gear_list()
+	for(var/type in typesof(/datum/gear)-/datum/gear)
+		var/datum/gear/G = new type()
+		gear_datums[G.display_name] = G
+
+/datum/gear
+	var/display_name       //Name/index.
+	var/path               //Path to item.
+	var/cost               //Number of points used.
+	var/slot               //Slot to equip to.
+	var/list/allowed_roles //Roles that can spawn with this item.
+
+//Standard gear datums.
+/datum/gear/tie_horrible
+	display_name = "horrible tie"
+	path = /obj/item/clothing/tie/horrible
+	cost = 2
+
+/datum/gear/hairflower
+	display_name = "hair flower pin"
+	path = /obj/item/clothing/head/hairflower
+	cost = 1
+	slot = SLOT_HEAD
+
+/datum/gear/bandana
+	display_name = "pirate bandana"
+	path = /obj/item/clothing/head/bandana
+	cost = 1
+	slot = SLOT_HEAD
+
+/datum/gear/overalls
+	display_name = "overalls"
+	path = /obj/item/clothing/suit/apron/overalls
+	cost = 1
+	slot = SLOT_OCLOTHING
+
+/datum/gear/wcoat
+	display_name = "waistcoat"
+	path = /obj/item/clothing/suit/wcoat
+	cost = 1
+	slot = SLOT_OCLOTHING
+
+/datum/gear/prescription
+	display_name = "prescription sunglasses"
+	path = /obj/item/clothing/glasses/sunglasses/prescription
+	cost = 2
+	slot = SLOT_EYES
+
+/datum/gear/eyepatch
+	display_name = "eyepatch"
+	path = /obj/item/clothing/glasses/eyepatch
+	cost = 1
+	slot = SLOT_EYES
+
+/datum/gear/flatcap
+	display_name = "flat cap"
+	path = /obj/item/clothing/head/flatcap
+	cost = 1
+	slot = SLOT_HEAD
+
+/datum/gear/labcoat
+	display_name = "labcoat"
+	path = /obj/item/clothing/suit/storage/labcoat
+	cost = 2
+	slot = SLOT_OCLOTHING
+
+/datum/gear/sandal
+	display_name = "sandals"
+	path = /obj/item/clothing/shoes/sandal
+	cost = 1
+	slot = SLOT_FEET
+
+/datum/gear/leather
+	display_name = "leather shoes"
+	path = /obj/item/clothing/shoes/leather
+	cost = 1
+	slot = SLOT_FEET
+
+/datum/gear/dress_shoes
+	display_name = "dress shoes"
+	path = /obj/item/clothing/shoes/centcom
+	cost = 1
+	slot = SLOT_FEET
+
+//Security
+/datum/gear/security
+	display_name = "Security HUD"
+	path = /obj/item/clothing/glasses/hud/security
+	cost = 1
+	slot = SLOT_EYES
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+/datum/gear/sec_beret
+	display_name = "security beret"
+	path = /obj/item/clothing/head/beret/sec
+	cost = 1
+	slot = SLOT_HEAD
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+//Engineering
+/datum/gear/eng_beret
+	display_name = "engineering beret"
+	path = /obj/item/clothing/head/beret/eng
+	cost = 1
+	slot = SLOT_HEAD
+	allowed_roles = list("Station Engineering","Atmospheric Technician","Chief Engineer")
+
+//Species-specific gear datums.
+/datum/gear/zhan_furs
+	display_name = "Zhan-Khazan furs"
+	path = /obj/item/clothing/suit/tajaran/furs
+	cost = 3
+
+/datum/gear/zhan_scarf
+	display_name = "Zhan-Khazan headscarf"
+	path = /obj/item/clothing/head/tajaran/scarf
+	cost = 2
+
+/datum/gear/unathi_robe
+	display_name = "roughspun robe"
+	path = /obj/item/clothing/suit/unathi/robe
+	cost = 3
+	slot = SLOT_OCLOTHING
+
+/datum/gear/unathi_mantle
+	display_name = "hide mantle"
+	path = /obj/item/clothing/suit/unathi/mantle
+	cost = 2
+	slot = SLOT_OCLOTHING