Revert "Revert "Synthetics revised""

This reverts commit df2980db46.

code/modules/mob/living/carbon/brain/MMI.dm

@@ -20,6 +20,8 @@
 	var/mob/living/carbon/brain/brainmob = null//The current occupant.
 	var/mob/living/silicon/robot = null//Appears unused.
 	var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm.
+	
+	var/machine_brain_type="MMI"
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
 		if(istype(O,/obj/item/organ/brain) && !brainmob) //Time to stick a brain in it --NEO

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -39,7 +39,6 @@
 	brainmob.timeofhostdeath = H.timeofdeath
 	if(H.mind)
 		H.mind.transfer_to(brainmob)
-
 	brainmob << "\blue You feel slightly disoriented. That's normal when you're just a brain."
 	callHook("debrain", list(brainmob))
 
@@ -53,20 +52,24 @@
 		usr << "You can feel the small spark of life still left in this one."
 	else
 		usr << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.."
-
+	
+		
 /obj/item/organ/brain/removed(var/mob/living/target,var/mob/living/user)
-
 	..()
-
 	var/mob/living/simple_animal/borer/borer = target.has_brain_worms()
-
 	if(borer)
 		borer.detatch() //Should remove borer if the brain is removed - RR
-
 	var/mob/living/carbon/human/H = target
 	var/obj/item/organ/brain/B = src
 	if(istype(B) && istype(H))
 		B.transfer_identity(target)
+		
+/obj/item/organ/brain/exposed_to_the_world()
+	var/datum/organ/internal/brain/robot/robotic_brain=organ_data
+	if (istype(robotic_brain))
+		var/new_mmi=robotic_brain.create_robot_brain_replacement(brainmob,src.loc)
+		del(src)
+		return new_mmi
 
 /obj/item/organ/brain/replaced(var/mob/living/target)
 

code/modules/mob/living/carbon/brain/posibrain.dm

@@ -5,6 +5,7 @@
 	icon_state = "posibrain"
 	w_class = 3
 	origin_tech = "engineering=4;materials=4;bluespace=2;programming=4"
+	machine_brain_type="Posibrain"
 
 	construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"plasma"=100,"diamond"=10)
 	construction_time = 75

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

@@ -1659,3 +1659,82 @@
 		if(eyes && istype(eyes) && !eyes.status & ORGAN_CUT_AWAY)
 			return 1
 	return 0
+
+/mob/living/carbon/human/proc/hair_species_name()
+	var/datum/organ/external/head/head_organ = get_organ("head")
+	if (head_organ.covering)
+		return head_organ.covering.hair_species
+	return species.name
+		
+	
+/mob/living/carbon/human/proc/valid_hairstyles_for_this_mob()
+	return get_valid_hairstyles(gender, hair_species_name())
+
+	
+/mob/living/carbon/human/proc/valid_facialhairstyles_for_this_mob()
+	return get_valid_facialhairstyles(gender, hair_species_name())
+	
+	
+/mob/living/carbon/human/proc/should_we_show_hair()
+	var/datum/organ/external/head/head_organ = get_organ("head")
+	if(!head_organ || (head_organ.status & ORGAN_DESTROYED))
+		return 
+	if( (head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR)))
+		return
+	return TRUE
+	
+/mob/living/carbon/human/proc/validate_hair()
+	var/list/hair=valid_hairstyles_for_this_mob()
+	if (!(h_style in hair))
+		h_style=null
+	var/list/face=valid_facialhairstyles_for_this_mob()
+	if (!(f_style in face))
+		f_style=null
+
+		
+/mob/living/carbon/human/proc/hair_icon()
+	if (h_style)
+		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
+		var/icon/hair = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+		if(hair_style.do_colouration)
+			hair.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+		return hair
+		
+	
+/mob/living/carbon/human/proc/facial_hair_icon()
+	if (f_style)
+		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
+		var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+		if(facial_hair_style.do_colouration)
+			facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+		return facial_s
+		
+		
+/mob/living/carbon/human/proc/get_eye_icon_state()
+	var/datum/organ/external/head/head_organ = get_organ("head")
+	if (head_organ.covering)
+		return head_organ.covering.eyes_state
+	return species.eyes
+	
+	
+/mob/living/carbon/human/proc/eye_icon()
+	var/icon/result_icon = new/icon('icons/mob/human_face.dmi', get_eye_icon_state())
+	result_icon.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+	return result_icon
+
+
+/mob/living/carbon/human/proc/tail_icon_state()
+	var/datum/organ/external/groin/groin_organ = get_organ("groin")
+	if (groin_organ.covering)
+		return list(groin_organ.covering.tail,groin_organ.covering.colour)
+	if (species.tail)
+		return list(species.tail,rgb(r_skin, g_skin, b_skin))
+		
+	
+/mob/living/carbon/human/proc/tail_icon()
+	var/list/tail_info = tail_icon_state()
+	if(!isnull(tail_info))
+		if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
+			var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[tail_info[1]]_s")
+			tail_s.Blend(tail_info[2], ICON_ADD)
+			return tail_s

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

@@ -30,5 +30,5 @@
 	..(new_loc, "Diona")
 
 /mob/living/carbon/human/machine/New(var/new_loc)
-	h_style = "blue IPC screen"
+	h_style = "Bald"
 	..(new_loc, "Machine")

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

@@ -201,10 +201,131 @@
 // Grabs the window recieved when you click-drag someone onto you.
 /datum/species/proc/get_inventory_dialogue(var/mob/living/carbon/human/H)
 	return
+	
 
 //Used by xenos understanding larvae and dionaea understanding nymphs.
 /datum/species/proc/can_understand(var/mob/other)
 	return
+	
+	
+/datum/species/proc/blend_preview_icon(var/icon/main_icon,var/datum/preferences/preferences,var/paint_colour)
+	if(paint_colour)
+		main_icon.Blend(paint_colour, ICON_ADD)
+		return 
+	if(flags & HAS_SKIN_COLOR)
+		main_icon.Blend(rgb(preferences.r_skin, preferences.g_skin, preferences.b_skin), ICON_ADD)
+		return
+	if(flags & HAS_SKIN_TONE) // Skin tone
+		if (preferences.s_tone >= 0)
+			main_icon.Blend(rgb(preferences.s_tone, preferences.s_tone, preferences.s_tone), ICON_ADD)
+		else
+			main_icon.Blend(rgb(-preferences.s_tone, -preferences.s_tone, -preferences.s_tone), ICON_SUBTRACT)
+			
+	
+/datum/species/proc/get_organ_preview_icon(var/name, var/robot, var/gendered, var/gender_string, var/datum/preferences/preferences, var/datum/synthetic_limb_cover/covering, var/paint_colour)
+	var/icon_name = icobase
+	if (robot)
+		icon_name = (istype(covering)) ? covering.main_icon : 'icons/mob/human_races/robotic.dmi'
+	var/state_name = name
+	if (gendered)
+		state_name+="_[gender_string]"
+	var/icon/result = new /icon(icon_name,state_name)
+	blend_preview_icon(result,preferences,paint_colour)
+	return result
+	
+
+/datum/species/proc/get_is_preview_organ_robotic(var/name,var/datum/preferences/preferences)
+	if (flags & IS_SYNTHETIC)
+		return TRUE
+	if (name in preferences.organ_data)
+		var/list/organ_robotic_info=preferences.organ_data[name]
+		if (istype(organ_robotic_info))
+			return TRUE
+			
+/datum/species/proc/get_preview_organ_covering(var/name,var/datum/preferences/preferences)
+	if (name in preferences.organ_data)
+		var/list/organ_robotic_info=preferences.organ_data[name]
+		if (istype(organ_robotic_info))
+			return organ_robotic_info
+	if (preferences.species=="Machine")
+		if (preferences.covering_type)
+			return list(preferences.covering_type,rgb(preferences.r_skin,preferences.g_skin,preferences.b_skin))
+			
+			
+/datum/species/proc/get_tail_preview_icon(var/list/preview_coverings,var/datum/preferences/preferences)
+	var/tail_state=null
+	if (!(isnull(preview_coverings["groin"])))
+		var/datum/synthetic_limb_cover/covering=preview_coverings["groin"]
+		tail_state=covering.tail
+	if(tail)
+		tail_state="[tail]_s"
+	if(tail_state)
+		var/icon/result = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = tail_state)
+		result.Blend(rgb(preferences.r_hair,preferences.g_hair,preferences.b_hair),ICON_ADD)
+		return result
+		
+/datum/species/proc/get_eyes_preview_icon(var/list/preview_coverings,var/datum/preferences/preferences)
+	var/eye_state=null
+	if (!(isnull(preview_coverings["head"])))
+		var/datum/synthetic_limb_cover/covering=preview_coverings["head"]
+		eye_state=covering.eyes_state
+	else
+		eye_state=eyes
+	var/icon/result = new/icon('icons/mob/human_face.dmi',eye_state)
+	result.Blend(rgb(preferences.r_eyes,preferences.g_eyes,preferences.b_eyes),ICON_ADD)
+	return result
+	
+/* This function takes a preferences object and generates a complete body and hair icon for that set of preferences. It's needlessly complicated
+and duplicates a lot of what's going on in update_icons. The two systems should be combined somehow, possibly by using a 'visual identity' object
+that could be created from either a living human or a preferences object and then passing that to a single render function, but I'll leave that 
+exercise for another day.
+
+See code\modules\mob\new_player\preferences_setup.dm for where it's used. 
+																							- jack_fractal*/
+/datum/species/proc/create_body_preview_icon(var/datum/preferences/preferences)
+	var/gender_string = (preferences.gender==FEMALE) ? "f" : "m"
+	var/icon/preview_icon = new/icon('icons/mob/human_face.dmi', "blank_eyes") // this is just an empty icon
+	var/list/external_organs = list("torso","groin","head","r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","l_arm","l_hand")
+	var/list/coverings=list()
+	var/list/gendered_organs = list("torso","groin","head")
+	var/list/limb_coverings = get_limb_covering_references()
+	var/list/limb_coverings_names = get_limb_covering_list()
+	for (var/name in external_organs)
+		if(preferences.organ_data[name] == "amputated") // amputated organs don't show up
+			continue
+		var/robotic = get_is_preview_organ_robotic(name,preferences)
+		var/datum/synthetic_limb_cover/covering = null
+		var/paint_colour=null
+		if (robotic)
+			var/list/covering_as_list=get_preview_organ_covering(name, preferences)
+			if (istype(covering_as_list))
+				covering=limb_coverings[limb_coverings_names[covering_as_list[1]]]
+				paint_colour=covering_as_list[2]
+		coverings[name]=covering
+		var/icon/organ_icon = get_organ_preview_icon(name, robotic, (name in gendered_organs), gender_string, preferences, covering, paint_colour)
+		preview_icon.Blend(organ_icon, ICON_OVERLAY)
+		del(organ_icon)
+	var/icon/tail_icon = get_tail_preview_icon(coverings,preferences) // Tail
+	if(tail_icon)
+		preview_icon.Blend(tail_icon, ICON_OVERLAY)
+		del(tail_icon)
+	var/icon/eye_icon = get_eyes_preview_icon(coverings,preferences)
+	if(eye_icon)
+		preview_icon.Blend(eye_icon, ICON_OVERLAY)
+		del(eye_icon)
+	var/datum/sprite_accessory/hair_style = hair_styles_list[preferences.h_style]
+	if(hair_style)
+		var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+		hair_s.Blend(rgb(preferences.r_hair, preferences.g_hair, preferences.b_hair), ICON_ADD)
+		preview_icon.Blend(hair_s, ICON_OVERLAY)
+		del(hair_s)
+	var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[preferences.f_style]
+	if(facial_hair_style)
+		var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+		facial_s.Blend(rgb(preferences.r_facial, preferences.g_facial, preferences.b_facial), ICON_ADD)
+		preview_icon.Blend(facial_s, ICON_OVERLAY)
+		del(facial_s)
+	return preview_icon
 
 /datum/species/human
 	name = "Human"
@@ -474,9 +595,16 @@
 
 	has_organ = list(
 		"heart" =    /datum/organ/internal/heart,
-		"brain" =    /datum/organ/internal/brain,
+		"brain" =    /datum/organ/internal/brain/robot,
 		)
-
+/datum/species/machine/create_organs(var/mob/living/carbon/human/H)
+	..()
+	var/datum/organ/internal/brain/robot/brain_datum = H.internal_organs_by_name["brain"] // handle weird robot brains
+	if (istype(brain_datum))
+		if (isnull(brain_datum.machine_brain_type))
+			brain_datum.machine_brain_type="Posibrain"
+	
+	
 /datum/species/bug
 	name = "Vaurca"
 	name_plural = "varucae"

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

@@ -234,21 +234,58 @@ proc/get_damage_icon_part(damage_state, body_part)
 	overlays_standing[DAMAGE_LAYER]	= standing_image
 
 	if(update_icons)   update_icons()
+	
+
+/mob/living/carbon/human/proc/get_skin_tone_key()
+	if (species.flags & HAS_SKIN_COLOR)
+		return "[r_skin],[g_skin],[b_skin]"
+	if(species.flags & HAS_SKIN_TONE)
+		return "[s_tone]"
+	return ""
+	
+
+/mob/living/carbon/human/proc/get_icon_key(var/list/mutations=list())
+	if (!mutations)
+		mutations=get_visible_mutations()
+	var/icon_key = "[species.race_key][(gender == FEMALE ? "f" : "m")][get_skin_tone_key()]"
+	for(var/datum/organ/external/part in organs) // get the part icon keys
+		icon_key = "[icon_key][part.get_icon_key()]"
+	return "[icon_key][mutations["husk"]][mutations["fat"]][mutations["hulk"]][mutations["skeleton"]]"
+
+
+/mob/living/carbon/human/proc/get_visible_mutations()
+	return list("husk"=(HUSK in src.mutations),
+				"hulk"=(HULK in src.mutations),
+				"skeleton"=(SKELETON in src.mutations),
+				"fat"=(FAT in src.mutations))
+
+
+/mob/living/carbon/human/proc/skin_colour_info(var/list/mutations=list())
+	if (!mutations)
+		mutations=get_visible_mutations()
+	var/icon_blend=ICON_ADD
+	var/colour=rgb(127,127,127)
+	var/good=FALSE
+	if (species.flags & HAS_SKIN_COLOR)
+		colour=rgb(r_skin,g_skin,b_skin)
+		good=TRUE
+	if(!mutations["husk"] && !mutations["hulk"]) // if we have regular skin
+		if(species.flags & HAS_SKIN_TONE)
+			icon_blend=(s_tone >= 0 ? ICON_ADD : ICON_SUBTRACT)
+			var/res=(s_tone >= 0 ? s_tone : -s_tone)
+			colour=rgb(res,res,res)
+			good=TRUE
+	return list("rgb"=colour,"mode"=icon_blend,"blend"=good)
+
 
 //BASE MOB SPRITE
 /mob/living/carbon/human/proc/update_body(var/update_icons=1)
-
 	var/husk_color_mod = rgb(96,88,80)
 	var/hulk_color_mod = rgb(48,224,40)
 	var/necrosis_color_mod = rgb(10,50,0)
 
-	var/husk = (HUSK in src.mutations)
-	var/fat = (FAT in src.mutations)
-	var/hulk = (HULK in src.mutations)
-	var/skeleton = (SKELETON in src.mutations)
-
+	var/list/mutations = get_visible_mutations()
 	var/g = (gender == FEMALE ? "f" : "m")
-	var/has_head = 0
 
 	//CACHING: Generate an index key from visible bodyparts.
 	//0 = destroyed, 1 = normal, 2 = robotic, 3 = necrotic.
@@ -259,22 +296,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 	stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi',"blank")
 
-	var/icon_key = "[species.race_key][g][s_tone]"
-	for(var/datum/organ/external/part in organs)
 
-		if(istype(part,/datum/organ/external/head) && !(part.status & ORGAN_DESTROYED))
-			has_head = 1
-
-		if(part.status & ORGAN_DESTROYED)
-			icon_key = "[icon_key]0"
-		else if(part.status & ORGAN_ROBOT)
-			icon_key = "[icon_key]2"
-		else if(part.status & ORGAN_DEAD)
-			icon_key = "[icon_key]3"
-		else
-			icon_key = "[icon_key]1"
-
-	icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0][s_tone]"
+	// GENERATE THE ICON KEY
+	var/icon_key = get_icon_key(mutations)
 
 	var/icon/base_icon
 	if(human_icon_cache[icon_key])
@@ -287,14 +311,18 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 	//BEGIN CACHED ICON GENERATION.
 
-		// Why don't we just make skeletons/shadows/golems a species? ~Z
-		var/race_icon =   (skeleton ? 'icons/mob/human_races/r_skeleton.dmi' : species.icobase)
-		var/deform_icon = (skeleton ? 'icons/mob/human_races/r_skeleton.dmi' : species.icobase)
+		// Why don't we just make mutations["skeleton"]s/shadows/golems a species? ~Z
+		var/race_icon =   (mutations["skeleton"] ? 'icons/mob/human_races/r_skeleton.dmi' : species.icobase)
+		var/deform_icon = (mutations["skeleton"] ? 'icons/mob/human_races/r_skeleton.dmi' : species.icobase)
 
+		var/list/skin_info = skin_colour_info(mutations) // get the skin tone info
+		
 		//Robotic limbs are handled in get_icon() so all we worry about are missing or dead limbs.
 		//No icon stored, so we need to start with a basic one.
 		var/datum/organ/external/chest = get_organ("chest")
-		base_icon = chest.get_icon(race_icon,deform_icon,g)
+		base_icon = chest.get_icon(race_icon,deform_icon,skin_info)
+		
+		
 
 		if(chest.status & ORGAN_DEAD)
 			base_icon.ColorTone(necrosis_color_mod)
@@ -307,10 +335,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 			if(part.status & ORGAN_DESTROYED)
 				continue
 
-			if (istype(part, /datum/organ/external/groin) || istype(part, /datum/organ/external/head))
-				temp = part.get_icon(race_icon,deform_icon,g)
-			else
-				temp = part.get_icon(race_icon,deform_icon)
+			temp = part.get_icon(race_icon,deform_icon,skin_info) // synthetics are handled here
 
 			if(part.status & ORGAN_DEAD)
 				temp.ColorTone(necrosis_color_mod)
@@ -345,48 +370,33 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 				base_icon.Blend(temp, ICON_OVERLAY)
 
-		if(!skeleton)
-			if(husk)
+		if(!mutations["skeleton"])
+			if(mutations["husk"])
 				base_icon.ColorTone(husk_color_mod)
-			else if(hulk)
+			else if(mutations["hulk"])
 				var/list/tone = ReadRGB(hulk_color_mod)
 				base_icon.MapColors(rgb(tone[1],0,0),rgb(0,tone[2],0),rgb(0,0,tone[3]))
 
-		//Handle husk overlay.
-		if(husk)
+		//Handle mutations["husk"] overlay.
+		if(mutations["husk"])
 			var/icon/mask = new(base_icon)
 			var/icon/husk_over = new(race_icon,"overlay_husk")
 			mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0)
 			husk_over.Blend(mask, ICON_ADD)
 			base_icon.Blend(husk_over, ICON_OVERLAY)
 
-
-		//Skin tone.
-		if(!husk && !hulk)
-			if(species.flags & HAS_SKIN_TONE)
-				if(s_tone >= 0)
-					base_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
-				else
-					base_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
-
 		human_icon_cache[icon_key] = base_icon
 
 		//log_debug("Generated new cached mob icon ([icon_key] \icon[human_icon_cache[icon_key]]) for [src]. [human_icon_cache.len] cached mob icons.")
 
 	//END CACHED ICON GENERATION.
-
 	stand_icon.Blend(base_icon,ICON_OVERLAY)
 
-	//Skin colour. Not in cache because highly variable (and relatively benign).
-	if (species.flags & HAS_SKIN_COLOR)
-		stand_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
-
-	if(has_head)
+	var/datum/organ/external/head = get_organ("head") // check if we have a head
+	if(head ? (head.status & ORGAN_DESTROYED ? 0 : 1) : 0) // we need a head and that head needs to not be destroyed
 		//Eyes
-		if(!skeleton)
-			var/icon/eyes = new/icon('icons/mob/human_face.dmi', species.eyes)
-			eyes.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-			stand_icon.Blend(eyes, ICON_OVERLAY)
+		if(!mutations["skeleton"])
+			stand_icon.Blend(eye_icon(), ICON_OVERLAY)
 
 		//Mouth	(lipstick!)
 		if(lip_style && (species && species.flags & HAS_LIPS))	//skeletons are allowed to wear lipstick no matter what you think, agouri.
@@ -394,7 +404,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 	//Underwear
 	if(underwear >0 && underwear < 12 && species.flags & HAS_UNDERWEAR)
-		if(!fat && !skeleton)
+		if(!mutations["fat"] && !mutations["skeleton"])
 			stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
 
 	if(undershirt>0 && undershirt <= undershirt_t.len && species.flags & HAS_UNDERWEAR)
@@ -407,47 +417,27 @@ proc/get_damage_icon_part(damage_state, body_part)
 	update_tail_showing(0)
 
 
+/mob/living/carbon/human/proc/create_hair_icon()
+	if(!should_we_show_hair()) // if we're missing our head or we're wearing a mask, no hair
+		return 
+	validate_hair() // make sure our hair is valid
+	var/icon/face_standing	= new /icon('icons/mob/human_face.dmi',"bald_s") //base icons
+	var/icon/facial_s = facial_hair_icon()
+	if (facial_s)
+		face_standing.Blend(facial_s, ICON_OVERLAY)
+	var/icon/hair_s = hair_icon()
+	if (hair_s)
+		face_standing.Blend(hair_s, ICON_OVERLAY)
+	overlays_standing[HAIR_LAYER]	= image(face_standing)
 
 
 //HAIR OVERLAY
 /mob/living/carbon/human/proc/update_hair(var/update_icons=1)
-	//Reset our hair
-	overlays_standing[HAIR_LAYER]	= null
-
-	var/datum/organ/external/head/head_organ = get_organ("head")
-	if( !head_organ || (head_organ.status & ORGAN_DESTROYED) )
-		if(update_icons)   update_icons()
-		return
-
-	//masks and helmets can obscure our hair.
-	if( (head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR)))
-		if(update_icons)   update_icons()
-		return
-
-	//base icons
-	var/icon/face_standing	= new /icon('icons/mob/human_face.dmi',"bald_s")
-
-	if(f_style)
-		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
-		if(facial_hair_style && facial_hair_style.species_allowed && src.species.name in facial_hair_style.species_allowed)
-			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
-			if(facial_hair_style.do_colouration)
-				facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
-
-			face_standing.Blend(facial_s, ICON_OVERLAY)
-
-	if(h_style && !(head && (head.flags & BLOCKHEADHAIR)))
-		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
-		if(hair_style && src.species.name in hair_style.species_allowed)
-			var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
-			if(hair_style.do_colouration)
-				hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
-
-			face_standing.Blend(hair_s, ICON_OVERLAY)
-
-	overlays_standing[HAIR_LAYER]	= image(face_standing)
-
-	if(update_icons)   update_icons()
+	overlays_standing[HAIR_LAYER]	= null //Reset our hair
+	create_hair_icon() // do the hair blending
+	if(update_icons)
+		update_icons()
+		
 
 /mob/living/carbon/human/update_mutations(var/update_icons=1)
 	var/fat
@@ -988,16 +978,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 		overlays_standing[L_HAND_LAYER] = null
 	if(update_icons)   update_icons()
 
+
 /mob/living/carbon/human/proc/update_tail_showing(var/update_icons=1)
 	overlays_standing[TAIL_LAYER] = null
-
-	if(species.tail)
-		if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
-			var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
-			tail_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
-
-			overlays_standing[TAIL_LAYER]	= image(tail_s)
-
+	var/icon/tail_s = tail_icon()
+	if (tail_s)
+		overlays_standing[TAIL_LAYER] = image(tail_s)
 	if(update_icons)
 		update_icons()
 

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

@@ -105,6 +105,11 @@
 			//H.jitteriness = 0
 			H.update_hair()
 	return
+	
+	
+/datum/species/proc/get_eye_icon()
+	return eyes
+
 
 /datum/species/human
 	name = "Human"
@@ -328,6 +333,9 @@
 
 	blood_color = "#1F181F"
 	flesh_color = "#575757"
+	
+	var/brain_type = 'posibrain' // default is robots
+	
 
 //Species unarmed attacks
 

code/modules/mob/living/silicon/robot/component.dm

@@ -168,6 +168,11 @@
 	name = "camera"
 	icon_state = "camera"
 	icon_state_broken = "camera_broken"
+	
+/obj/item/robot_parts/robot_component/law_computer
+	name = "law computer"
+	icon_state = "radio"
+	icon_state_broken = "radio_broken"
 
 /obj/item/robot_parts/robot_component/diagnosis_unit
 	name = "diagnosis unit"

code/modules/mob/new_player/preferences_setup.dm

@@ -177,590 +177,42 @@ datum/preferences
 		g_skin = green
 		b_skin = blue
 
-
-	proc/update_preview_icon()		//seriously. This is horrendous.
+	proc/job_type_info()
+		var/job_type=null
+		var/job_index=null
+		if (job_civilian_high)
+			job_type="[CIVILIAN]"
+			job_index="[job_civilian_high]"
+		if (job_engsec_high)
+			job_type="[ENGSEC]"
+			job_index="[job_engsec_high]"
+		if (job_medsci_high)
+			job_type="[MEDSCI]"
+			job_index="[job_medsci_high]"
+		if (!job_type)
+			job_type="DEFAULT"
+			job_index=1
+		return list(job_type,job_index)
+		
+	proc/update_preview_icon() //this is a little better - jf
 		del(preview_icon_front)
 		del(preview_icon_side)
 		del(preview_icon)
-
-		var/g = "m"
-		if(gender == FEMALE)	g = "f"
-
-		var/icon/icobase
 		var/datum/species/current_species = all_species[species]
-
-		if(current_species)
-			icobase = current_species.icobase
-		else
-			icobase = 'icons/mob/human_races/r_human.dmi'
-
-		preview_icon = new /icon(icobase, "torso_[g]")
-		preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
-		preview_icon.Blend(new /icon(icobase, "head_[g]"), ICON_OVERLAY)
-
-		for(var/name in list("r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","l_arm","l_hand"))
-			if(organ_data[name] == "amputated") continue
-
-			var/icon/temp = new /icon(icobase, "[name]")
-			if(organ_data[name] == "cyborg")
-				temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-
-			preview_icon.Blend(temp, ICON_OVERLAY)
-
-		//Tail
-		if(current_species && (current_species.tail))
-			var/icon/temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[current_species.tail]_s")
-			preview_icon.Blend(temp, ICON_OVERLAY)
-
-		// Skin color
-		if(current_species && (current_species.flags & HAS_SKIN_COLOR))
-			preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
-
-		// Skin tone
-		if(current_species && (current_species.flags & HAS_SKIN_TONE))
-			if (s_tone >= 0)
-				preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
-			else
-				preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
-
-		var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
-		eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-
-		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
-		if(hair_style)
-			var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
-			hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
-			eyes_s.Blend(hair_s, ICON_OVERLAY)
-
-		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
-		if(facial_hair_style)
-			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
-			facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
-			eyes_s.Blend(facial_s, ICON_OVERLAY)
-
-		var/icon/underwear_s = null
-		if(underwear > 0 && underwear < 7 && (current_species && (current_species.flags & HAS_UNDERWEAR)))
-			underwear_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "underwear[underwear]_[g]_s")
-
-		var/icon/undershirt_s = null
-		if(undershirt > 0 && undershirt < 16 && (current_species && (current_species.flags & HAS_UNDERWEAR)))
-			undershirt_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "undershirt[undershirt]_s")
-
-		var/icon/clothes_s = null
-		if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
-			clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
-			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-			if(backbag == 2)
-				clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-			else if(backbag == 3 || backbag == 4)
-				clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
-		else if(job_civilian_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
-			switch(job_civilian_high)
-				if(HOP)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(BARTENDER)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(BOTANIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CHEF)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(JANITOR)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(LIBRARIAN)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(QUARTERMASTER)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CARGOTECH)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(MINER)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(LAWYER)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CHAPLAIN)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CLOWN)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "clown_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
-				if(MIME)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "mime_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-/*				if(INTERN)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "white_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					if(backbag == 2)
-						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-					else if(backbag == 3 || backbag == 4)
-						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)*/
-
-		else if(job_medsci_high)
-			switch(job_medsci_high)
-				if(RD)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(SCIENTIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(XENOBIOLOGIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CHEMIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY)
-					else
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CMO)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY)
-					else
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(DOCTOR)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
-					else
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(EMT)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "emt_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "emtpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-emt"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(GENETICIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY)
-					else
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(VIROLOGIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(ROBOTICIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(INTERN_MED)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(INTERN_SCI)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
-		else if(job_engsec_high)
-			switch(job_engsec_high)
-				if(CAPTAIN)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY)
-					else
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(HOS)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hosberet"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(WARDEN)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
-					else
-						clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(DETECTIVE)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "wardentanclothes_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
-				if(FORENSICS)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "polsuit_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
-				if(OFFICER)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "officerberet"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CHIEF)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "blueprints"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(ENGINEER)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(ATMOSTECH)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
-					if(prob(1))
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(INTERN_SEC)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "redshirt2_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "officerberet"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(INTERN_ENG)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "e_beret_badge"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
-				if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
-					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
-					if(backbag == 2)
-						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-					else if(backbag == 3 || backbag == 4)
-						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(CYBORG)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
-					if(backbag == 2)
-						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-					else if(backbag == 3 || backbag == 4)
-						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
+		if(!current_species) // no species? no preview for you
+			return
+		preview_icon = new/icon("icons/turf/floors.dmi","floor")		
+		preview_icon.Blend(current_species.create_body_preview_icon(src),ICON_OVERLAY) // create the body icon
 		if(disabilities & NEARSIGHTED)
 			preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
-
-		preview_icon.Blend(eyes_s, ICON_OVERLAY)
-		if(underwear_s)
-			preview_icon.Blend(underwear_s, ICON_OVERLAY)
-		if(undershirt_s)
-			preview_icon.Blend(undershirt_s, ICON_OVERLAY)
-		if(clothes_s)
-			preview_icon.Blend(clothes_s, ICON_OVERLAY)
+		if (current_species.flags & HAS_UNDERWEAR) // do we even need to handle underwear?
+			if(underwear > 0 && underwear < 7)
+				preview_icon.Blend(new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "underwear[underwear]_[(gender==FEMALE) ? "f" : "m"]_s"),ICON_OVERLAY)			
+			if(undershirt > 0 && undershirt < 16)
+				preview_icon.Blend(new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "undershirt[undershirt]_s"),ICON_OVERLAY)
+		var/list/job_types=job_type_info()
+		var/datum/preview/job/current_job=get_job_preview_for_index(job_types[1],job_types[2])
+		if(istype(current_job))
+			preview_icon.Blend(current_job.create_clothes_icon(backbag), ICON_OVERLAY)
 		preview_icon_front = new(preview_icon, dir = SOUTH)
-		preview_icon_side = new(preview_icon, dir = WEST)
-
-		del(eyes_s)
-		del(underwear_s)
-		del(undershirt_s)
-		del(clothes_s)
+		preview_icon_side = new(preview_icon, dir = WEST)