Merge pull request #4331 from KasparoVy/voxhair

Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Fixes/Refactors Morph + Features to Morph and CMA...
2026-08-23 20:16:55 +01:00 · 2016-05-13 15:36:34 -04:00
parent 47e00dee34 e5fae9c078
commit 3ee2e470a1
37 changed files with 704 additions and 326 deletions
@@ -76,7 +76,11 @@
 #define APPEARANCE_FACIAL_HAIR_COLOR 128
 #define APPEARANCE_EYE_COLOR 256
 #define APPEARANCE_ALL_HAIR APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR
-#define APPEARANCE_ALL 511
+#define APPEARANCE_HEAD_ACCESSORY 512
+#define APPEARANCE_MARKINGS 1024
+#define APPEARANCE_BODY_ACCESSORY 2048
+#define APPEARANCE_ALL_BODY APPEARANCE_ALL_HAIR|APPEARANCE_HEAD_ACCESSORY|APPEARANCE_MARKINGS|APPEARANCE_BODY_ACCESSORY
+#define APPEARANCE_ALL 4095

 // Intents
 #define I_HELP		"help"
@@ -52,7 +52,7 @@ proc/random_hair_style(var/gender, species = "Human")
 	if(valid_hairstyles.len)
 		h_style = pick(valid_hairstyles)

-	return h_style
+		return h_style

 proc/GetOppositeDir(var/dir)
 	switch(dir)
@@ -126,6 +126,7 @@

 proc/get_id_photo(var/mob/living/carbon/human/H)
 	var/icon/preview_icon = null
+	var/obj/item/organ/external/head/head_organ = H.get_organ("head")

 	var/g = "m"
 	if (H.gender == FEMALE)
@@ -170,32 +171,32 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		eyes_s.Blend(rgb(H.r_eyes, H.g_eyes, H.b_eyes), ICON_ADD)
 		face_s.Blend(eyes_s, ICON_OVERLAY)

-	var/datum/sprite_accessory/hair_style = hair_styles_list[H.h_style]
+	var/datum/sprite_accessory/hair_style = hair_styles_list[head_organ.h_style]
 	if(hair_style)
 		var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
 		// I'll want to make a species-specific proc for this sooner or later
 		// But this'll do for now
-		if(H.get_species() == "Slime People")
+		if(head_organ.species.name == "Slime People")
 			hair_s.Blend(rgb(H.r_skin, H.g_skin, H.b_skin, 160), ICON_ADD)
 		else
-			hair_s.Blend(rgb(H.r_hair, H.g_hair, H.b_hair), ICON_ADD)
+			hair_s.Blend(rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair), ICON_ADD)
 		face_s.Blend(hair_s, ICON_OVERLAY)

 	//Head Accessory
-	if(H.species.bodyflags & HAS_HEAD_ACCESSORY)
-		var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[H.ha_style]
+	if(head_organ.species.bodyflags & HAS_HEAD_ACCESSORY)
+		var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[head_organ.ha_style]
 		if(head_accessory_style && head_accessory_style.species_allowed)
 			var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
-			head_accessory_s.Blend(rgb(H.r_headacc, H.g_headacc, H.b_headacc), ICON_ADD)
+			head_accessory_s.Blend(rgb(head_organ.r_headacc, head_organ.g_headacc, head_organ.b_headacc), ICON_ADD)
 			face_s.Blend(head_accessory_s, ICON_OVERLAY)

-	var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[H.f_style]
+	var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[head_organ.f_style]
 	if(facial_hair_style && 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(H.get_species() == "Slime People")
+		if(head_organ.species.name == "Slime People")
 			facial_s.Blend(rgb(H.r_skin, H.g_skin, H.b_skin, 160), ICON_ADD)
 		else
-			facial_s.Blend(rgb(H.r_facial, H.g_facial, H.b_facial), ICON_ADD)
+			facial_s.Blend(rgb(head_organ.r_facial, head_organ.g_facial, head_organ.b_facial), ICON_ADD)
 		face_s.Blend(facial_s, ICON_OVERLAY)

 	//Markings
@@ -30,20 +30,21 @@ BONUS
 		var/mob/living/M = A.affected_mob
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
+			var/obj/item/organ/external/head/head_organ = H.get_organ("head")
 			switch(A.stage)
 				if(1, 2)
 					to_chat(H, "<span class='warning'>Your chin itches.</span>")
-					if(H.f_style == "Shaved")
-						H.f_style = "Jensen Beard"
-						H.update_hair()
+					if(head_organ.f_style == "Shaved")
+						head_organ.f_style = "Jensen Beard"
+						H.update_fhair()
 				if(3, 4)
 					to_chat(H, "<span class='warning'>You feel tough.</span>")
-					if(!(H.f_style == "Dwarf Beard") && !(H.f_style == "Very Long Beard") && !(H.f_style == "Full Beard"))
-						H.f_style = "Full Beard"
-						H.update_hair()
+					if(!(head_organ.f_style == "Dwarf Beard") && !(head_organ.f_style == "Very Long Beard") && !(head_organ.f_style == "Full Beard"))
+						head_organ.f_style = "Full Beard"
+						H.update_fhair()
 				else
 					to_chat(H, "<span class='warning'>You feel manly!</span>")
-					if(!(H.f_style == "Dwarf Beard") && !(H.f_style == "Very Long Beard"))
-						H.f_style = pick("Dwarf Beard", "Very Long Beard")
-						H.update_hair()
+					if(!(head_organ.f_style == "Dwarf Beard") && !(head_organ.f_style == "Very Long Beard"))
+						head_organ.f_style = pick("Dwarf Beard", "Very Long Beard")
+						H.update_fhair()
 	return
@@ -31,18 +31,20 @@ BONUS
 		to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flakey.")]</span>")
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
+			var/obj/item/organ/external/head/head_organ = H.get_organ("head")
 			switch(A.stage)
 				if(3, 4)
-					if(!(H.h_style == "Bald") && !(H.h_style == "Balding Hair"))
+					if(!(head_organ.h_style == "Bald") && !(head_organ.h_style == "Balding Hair"))
 						to_chat(H, "<span class='warning'>Your hair starts to fall out in clumps...</span>")
 						spawn(50)
-							H.h_style = "Balding Hair"
+							head_organ.h_style = "Balding Hair"
 							H.update_hair()
 				if(5)
-					if(!(H.f_style == "Shaved") || !(H.h_style == "Bald"))
+					if(!(head_organ.f_style == "Shaved") || !(head_organ.h_style == "Bald"))
 						to_chat(H, "<span class='warning'>Your hair starts to fall out in clumps...</span>")
 						spawn(50)
-							H.f_style = "Shaved"
-							H.h_style = "Bald"
+							head_organ.f_style = "Shaved"
+							head_organ.h_style = "Bald"
 							H.update_hair()
+							H.update_fhair()
 	return
@@ -133,19 +133,20 @@ var/global/list/bad_blocks[0]
 	ResetUI(1)
 	// Hair
 	// FIXME:  Species-specific defaults pls
-	if(!character.h_style)
-		character.h_style = "Skinhead"
-	var/hair = hair_styles_list.Find(character.h_style)
+	var/obj/item/organ/external/head/H = character.get_organ("head")
+	if(!H.h_style)
+		H.h_style = "Skinhead"
+	var/hair = hair_styles_list.Find(H.h_style)

 	// Facial Hair
-	if(!character.f_style)
-		character.f_style = "Shaved"
-	var/beard	= facial_hair_styles_list.Find(character.f_style)
+	if(!H.f_style)
+		H.f_style = "Shaved"
+	var/beard	= facial_hair_styles_list.Find(H.f_style)

 	// Head Accessory
-	if(!character.ha_style)
-		character.ha_style = "None"
-	var/headacc	= head_accessory_styles_list.Find(character.ha_style)
+	if(!H.ha_style)
+		H.ha_style = "None"
+	var/headacc	= head_accessory_styles_list.Find(H.ha_style)

 	/*// Body Accessory
 	if(!character.body_accessory)
@@ -157,13 +158,13 @@ var/global/list/bad_blocks[0]
 		character.m_style = "None"
 	var/marks	= marking_styles_list.Find(character.m_style)

-	SetUIValueRange(DNA_UI_HAIR_R,	character.r_hair,		255,	1)
-	SetUIValueRange(DNA_UI_HAIR_G,	character.g_hair,		255,	1)
-	SetUIValueRange(DNA_UI_HAIR_B,	character.b_hair,		255,	1)
+	SetUIValueRange(DNA_UI_HAIR_R,	H.r_hair,				255,	1)
+	SetUIValueRange(DNA_UI_HAIR_G,	H.g_hair,				255,	1)
+	SetUIValueRange(DNA_UI_HAIR_B,	H.b_hair,				255,	1)

-	SetUIValueRange(DNA_UI_BEARD_R,	character.r_facial,		255,	1)
-	SetUIValueRange(DNA_UI_BEARD_G,	character.g_facial,		255,	1)
-	SetUIValueRange(DNA_UI_BEARD_B,	character.b_facial,		255,	1)
+	SetUIValueRange(DNA_UI_BEARD_R,	H.r_facial,				255,	1)
+	SetUIValueRange(DNA_UI_BEARD_G,	H.g_facial,				255,	1)
+	SetUIValueRange(DNA_UI_BEARD_B,	H.b_facial,				255,	1)

 	SetUIValueRange(DNA_UI_EYES_R,	character.r_eyes,		255,	1)
 	SetUIValueRange(DNA_UI_EYES_G,	character.g_eyes,		255,	1)
@@ -173,9 +174,9 @@ var/global/list/bad_blocks[0]
 	SetUIValueRange(DNA_UI_SKIN_G,	character.g_skin,		255,	1)
 	SetUIValueRange(DNA_UI_SKIN_B,	character.b_skin,		255,	1)

-	SetUIValueRange(DNA_UI_HACC_R,	character.r_headacc,	255,	1)
-	SetUIValueRange(DNA_UI_HACC_G,	character.g_headacc,	255,	1)
-	SetUIValueRange(DNA_UI_HACC_B,	character.b_headacc,	255,	1)
+	SetUIValueRange(DNA_UI_HACC_R,	H.r_headacc,			255,	1)
+	SetUIValueRange(DNA_UI_HACC_G,	H.g_headacc,			255,	1)
+	SetUIValueRange(DNA_UI_HACC_B,	H.b_headacc,			255,	1)

 	SetUIValueRange(DNA_UI_MARK_R,	character.r_markings,	255,	1)
 	SetUIValueRange(DNA_UI_MARK_G,	character.g_markings,	255,	1)
@@ -131,13 +131,14 @@
 			src.dna.UpdateUI()
 		dna.check_integrity()
 		var/mob/living/carbon/human/H = src
-		H.r_hair		= dna.GetUIValueRange(DNA_UI_HAIR_R,	255)
-		H.g_hair		= dna.GetUIValueRange(DNA_UI_HAIR_G,	255)
-		H.b_hair		= dna.GetUIValueRange(DNA_UI_HAIR_B,	255)
+		var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+		head_organ.r_hair		= dna.GetUIValueRange(DNA_UI_HAIR_R,	255)
+		head_organ.g_hair		= dna.GetUIValueRange(DNA_UI_HAIR_G,	255)
+		head_organ.b_hair		= dna.GetUIValueRange(DNA_UI_HAIR_B,	255)

-		H.r_facial		= dna.GetUIValueRange(DNA_UI_BEARD_R,	255)
-		H.g_facial		= dna.GetUIValueRange(DNA_UI_BEARD_G,	255)
-		H.b_facial		= dna.GetUIValueRange(DNA_UI_BEARD_B,	255)
+		head_organ.r_facial		= dna.GetUIValueRange(DNA_UI_BEARD_R,	255)
+		head_organ.g_facial		= dna.GetUIValueRange(DNA_UI_BEARD_G,	255)
+		head_organ.b_facial		= dna.GetUIValueRange(DNA_UI_BEARD_B,	255)

 		H.r_skin		= dna.GetUIValueRange(DNA_UI_SKIN_R,	255)
 		H.g_skin		= dna.GetUIValueRange(DNA_UI_SKIN_G,	255)
@@ -147,9 +148,9 @@
 		H.g_eyes		= dna.GetUIValueRange(DNA_UI_EYES_G,	255)
 		H.b_eyes		= dna.GetUIValueRange(DNA_UI_EYES_B,	255)

-		H.r_headacc		= dna.GetUIValueRange(DNA_UI_HACC_R,	255)
-		H.g_headacc		= dna.GetUIValueRange(DNA_UI_HACC_G,	255)
-		H.b_headacc		= dna.GetUIValueRange(DNA_UI_HACC_B,	255)
+		head_organ.r_headacc		= dna.GetUIValueRange(DNA_UI_HACC_R,	255)
+		head_organ.g_headacc		= dna.GetUIValueRange(DNA_UI_HACC_G,	255)
+		head_organ.b_headacc		= dna.GetUIValueRange(DNA_UI_HACC_B,	255)

 		H.r_markings	= dna.GetUIValueRange(DNA_UI_MARK_R,	255)
 		H.g_markings	= dna.GetUIValueRange(DNA_UI_MARK_G,	255)
@@ -168,17 +169,17 @@
 		//Hair
 		var/hair = dna.GetUIValueRange(DNA_UI_HAIR_STYLE,hair_styles_list.len)
 		if((0 < hair) && (hair <= hair_styles_list.len))
-			H.h_style = hair_styles_list[hair]
+			head_organ.h_style = hair_styles_list[hair]

 		//Facial Hair
 		var/beard = dna.GetUIValueRange(DNA_UI_BEARD_STYLE,facial_hair_styles_list.len)
 		if((0 < beard) && (beard <= facial_hair_styles_list.len))
-			H.f_style = facial_hair_styles_list[beard]
+			head_organ.f_style = facial_hair_styles_list[beard]

 		//Head Accessories
 		var/headacc = dna.GetUIValueRange(DNA_UI_HACC_STYLE,head_accessory_styles_list.len)
 		if((0 < headacc) && (headacc <= head_accessory_styles_list.len))
-			H.ha_style = head_accessory_styles_list[headacc]
+			head_organ.ha_style = head_accessory_styles_list[headacc]

 		//Markings
 		var/marks = dna.GetUIValueRange(DNA_UI_MARK_STYLE,marking_styles_list.len)
@@ -37,61 +37,7 @@
 		to_chat(usr, "\red You can't change your appearance right now!")
 		return
 	var/mob/living/carbon/human/M=usr
-
-	var/new_facial = input("Please select facial hair color.", "Character Generation",rgb(M.r_facial,M.g_facial,M.b_facial)) as null|color
-	if(new_facial)
-		M.r_facial = hex2num(copytext(new_facial, 2, 4))
-		M.g_facial = hex2num(copytext(new_facial, 4, 6))
-		M.b_facial = hex2num(copytext(new_facial, 6, 8))
-
-	var/new_hair = input("Please select hair color.", "Character Generation",rgb(M.r_hair,M.g_hair,M.b_hair)) as null|color
-	if(new_facial)
-		M.r_hair = hex2num(copytext(new_hair, 2, 4))
-		M.g_hair = hex2num(copytext(new_hair, 4, 6))
-		M.b_hair = hex2num(copytext(new_hair, 6, 8))
-
-	var/new_eyes = input("Please select eye color.", "Character Generation",rgb(M.r_eyes,M.g_eyes,M.b_eyes)) as null|color
-	if(new_eyes)
-		M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
-		M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
-		M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
-
-	var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation", "[35-M.s_tone]") as null|text
-
-	if (!new_tone)
-		new_tone = 35
-	M.s_tone = max(min(round(text2num(new_tone)), 220), 1)
-	M.s_tone =  -M.s_tone + 35
-
-	// hair
-	var/list/all_hairs = subtypesof(/datum/sprite_accessory/hair)
-	var/list/hairs = list()
-
-	// loop through potential hairs
-	for(var/x in all_hairs)
-		var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
-		hairs.Add(H.name) // add hair name to hairs
-		qdel(H) // delete the hair after it's all done
-
-	var/new_style = input("Please select hair style", "Character Generation",M.h_style)  as null|anything in hairs
-
-	// if new style selected (not cancel)
-	if (new_style)
-		M.h_style = new_style
-
-	// facial hair
-	var/list/all_fhairs = subtypesof(/datum/sprite_accessory/facial_hair)
-	var/list/fhairs = list()
-
-	for(var/x in all_fhairs)
-		var/datum/sprite_accessory/facial_hair/H = new x
-		fhairs.Add(H.name)
-		qdel(H)
-
-	new_style = input("Please select facial style", "Character Generation",M.f_style)  as null|anything in fhairs
-
-	if(new_style)
-		M.f_style = new_style
+	var/obj/item/organ/external/head/head_organ = M.get_organ("head")

 	var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
 	if (new_gender)
@@ -99,8 +45,93 @@
 			M.change_gender(MALE)
 		else
 			M.change_gender(FEMALE)
+
+	var/new_eyes = input("Please select eye color.", "Character Generation", rgb(M.r_eyes,M.g_eyes,M.b_eyes)) as null|color
+	if(new_eyes)
+		M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
+		M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
+		M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
+		M.change_eye_color(M.r_eyes, M.g_eyes, M.b_eyes)
+
+	// hair
+	var/list/valid_hairstyles = M.generate_valid_hairstyles()
+	var/new_style = input("Please select hair style", "Character Generation", head_organ.h_style) as null|anything in valid_hairstyles
+
+	// if new style selected (not cancel)
+	if (new_style)
+		head_organ.h_style = new_style
+
+	var/new_hair = input("Please select hair color.", "Character Generation", rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair)) as null|color
+	if(new_hair)
+		head_organ.r_hair = hex2num(copytext(new_hair, 2, 4))
+		head_organ.g_hair = hex2num(copytext(new_hair, 4, 6))
+		head_organ.b_hair = hex2num(copytext(new_hair, 6, 8))
+
+	// facial hair
+	var/list/valid_facial_hairstyles = M.generate_valid_facial_hairstyles()
+	new_style = input("Please select facial style", "Character Generation", head_organ.f_style) as null|anything in valid_facial_hairstyles
+
+	if(new_style)
+		head_organ.f_style = new_style
+
+	var/new_facial = input("Please select facial hair color.", "Character Generation", rgb(head_organ.r_facial, head_organ.g_facial, head_organ.b_facial)) as null|color
+	if(new_facial)
+		head_organ.r_facial = hex2num(copytext(new_facial, 2, 4))
+		head_organ.g_facial = hex2num(copytext(new_facial, 4, 6))
+		head_organ.b_facial = hex2num(copytext(new_facial, 6, 8))
+
+	//Head accessory.
+	if(head_organ.species.bodyflags & HAS_HEAD_ACCESSORY)
+		var/list/valid_head_accessories = M.generate_valid_head_accessories()
+		var/new_head_accessory = input("Please select head accessory style", "Character Generation", head_organ.ha_style) as null|anything in valid_head_accessories
+		if(new_head_accessory)
+			head_organ.ha_style = new_head_accessory
+
+		var/new_head_accessory_colour = input("Please select head accessory colour.", "Character Generation", rgb(head_organ.r_headacc, head_organ.g_headacc, head_organ.b_headacc)) as null|color
+		if(new_head_accessory_colour)
+			head_organ.r_headacc = hex2num(copytext(new_head_accessory_colour, 2, 4))
+			head_organ.g_headacc = hex2num(copytext(new_head_accessory_colour, 4, 6))
+			head_organ.b_headacc = hex2num(copytext(new_head_accessory_colour, 6, 8))
+
+	//Body markings.
+	if(M.species.bodyflags & HAS_MARKINGS)
+		var/list/valid_markings = M.generate_valid_markings()
+		var/new_marking = input("Please select marking style", "Character Generation", M.m_style) as null|anything in valid_markings
+		if(new_marking)
+			M.m_style = new_marking
+
+		var/new_marking_colour = input("Please select marking colour.", "Character Generation", rgb(M.r_markings, M.g_markings, M.b_markings)) as null|color
+		if(new_marking_colour)
+			M.r_markings = hex2num(copytext(new_marking_colour, 2, 4))
+			M.g_markings = hex2num(copytext(new_marking_colour, 4, 6))
+			M.b_markings = hex2num(copytext(new_marking_colour, 6, 8))
+
+	//Body accessory.
+	if(M.species.tail && M.species.bodyflags & HAS_TAIL)
+		var/list/valid_body_accessories = M.generate_valid_body_accessories()
+		if(valid_body_accessories.len > 1) //By default valid_body_accessories will always have at the very least a 'none' entry populating the list, even if the user's species is not present in any of the list items.
+			var/new_body_accessory = input("Please select body accessory style", "Character Generation", M.body_accessory) as null|anything in valid_body_accessories
+			if(new_body_accessory)
+				M.body_accessory = body_accessory_by_name[new_body_accessory]
+
+	//Skin tone.
+	if(M.species.bodyflags & HAS_SKIN_TONE)
+		var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation", "[M.s_tone]") as null|text
+		if (!new_tone)
+			new_tone = 35
+		M.s_tone = 35 - max(min(round(text2num(new_tone)), 220), 1)
+
+	//Skin colour.
+	if(M.species.bodyflags & HAS_SKIN_COLOR)
+		var/new_body_colour = input("Please select body colour.", "Character Generation", rgb(M.r_skin, M.g_skin, M.b_skin)) as null|color
+		if(new_body_colour)
+			M.r_skin = hex2num(copytext(new_body_colour, 2, 4))
+			M.g_skin = hex2num(copytext(new_body_colour, 4, 6))
+			M.b_skin = hex2num(copytext(new_body_colour, 6, 8))
+
+	M.force_update_limbs()
 	M.regenerate_icons()
-	M.check_dna()
+	M.update_dna()

 	M.visible_message("\blue \The [src] morphs and changes [M.get_visible_gender() == MALE ? "his" : M.get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god!  What the hell was that?  It sounded like flesh getting squished and bone ground into a different shape!")

@@ -68,6 +68,7 @@
 	..()

 /mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(var/mob/living/carbon/human/H)
+	var/obj/item/organ/external/head/head_organ = H.get_organ("head")
 	is_zombie = 1
 	if(H.wear_suit)
 		var/obj/item/clothing/suit/armor/A = H.wear_suit
@@ -82,7 +83,7 @@
 	icon = H.icon
 	speak_emote = list("groans")
 	icon_state = "zombie2_s"
-	H.h_style = null
+	head_organ.h_style = null
 	H.update_hair()
 	human_overlays = H.overlays
 	update_icons()
@@ -94,6 +94,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 		newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))

 	var/mob/living/carbon/human/vox = newraider.current
+	var/obj/item/organ/external/head/head_organ = vox.get_organ("head")

 	vox.real_name = capitalize(newname)
 	vox.name = vox.real_name
@@ -105,8 +106,8 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 	vox.add_language("Vox-pidgin")
 	vox.add_language("Galactic Common")
 	vox.add_language("Tradeband")
-	vox.h_style = "Short Vox Quills"
-	vox.f_style = "Shaved"
+	head_organ.h_style = "Short Vox Quills"
+	head_organ.f_style = "Shaved"

 	for(var/obj/item/organ/external/limb in vox.organs)
 		limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
@@ -133,6 +133,8 @@ proc/issyndicate(mob/living/M as mob)

 /datum/game_mode/proc/create_syndicate(var/datum/mind/synd_mind) // So we don't have inferior species as ops - randomize a human
 	var/mob/living/carbon/human/M = synd_mind.current
+	var/obj/item/organ/external/head/head_organ = M.get_organ("head")
+
 	M.set_species("Human",1)
 	M.dna.ready_dna(M) // Quadriplegic Nuke Ops won't be participating in the paralympics

@@ -149,18 +151,18 @@ proc/issyndicate(mob/living/M as mob)
 		if(prob(5))
 			facial_hair_style = pick(facial_hair_styles_list)

-	M.r_facial = hex2num(copytext(hair_c, 2, 4))
-	M.g_facial = hex2num(copytext(hair_c, 4, 6))
-	M.b_facial = hex2num(copytext(hair_c, 6, 8))
-	M.r_hair = hex2num(copytext(hair_c, 2, 4))
-	M.g_hair = hex2num(copytext(hair_c, 4, 6))
-	M.b_hair = hex2num(copytext(hair_c, 6, 8))
+	head_organ.r_facial = hex2num(copytext(hair_c, 2, 4))
+	head_organ.g_facial = hex2num(copytext(hair_c, 4, 6))
+	head_organ.b_facial = hex2num(copytext(hair_c, 6, 8))
+	head_organ.r_hair = hex2num(copytext(hair_c, 2, 4))
+	head_organ.g_hair = hex2num(copytext(hair_c, 4, 6))
+	head_organ.b_hair = hex2num(copytext(hair_c, 6, 8))
 	M.r_eyes = hex2num(copytext(eye_c, 2, 4))
 	M.g_eyes = hex2num(copytext(eye_c, 4, 6))
 	M.b_eyes = hex2num(copytext(eye_c, 6, 8))
 	M.s_tone = skin_tone
-	M.h_style = hair_style
-	M.f_style = facial_hair_style
+	head_organ.h_style = hair_style
+	head_organ.f_style = facial_hair_style
 	M.body_accessory = null

 /datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code)
@@ -91,16 +91,16 @@
 /obj/item/weapon/razor/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
-		var/obj/item/organ/external/head/C = H.organs_by_name["head"]
+		var/obj/item/organ/external/head/C = H.get_organ("head")
 		var/datum/robolimb/robohead = all_robolimbs[C.model]
 		if(user.zone_sel.selecting == "mouth")
 			if(!get_location_accessible(H, "mouth"))
 				to_chat(user, "<span class='warning'>The mask is in the way.</span>")
 				return
-			if((H.species && H.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+			if((C.species && C.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
 				to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of facial hair.</span>")
 				return
-			if(H.f_style == "Shaved")
+			if(C.f_style == "Shaved")
 				to_chat(user, "<span class='notice'>Already clean-shaven.</span>")
 				return
 			if(H == user) //shaving yourself
@@ -109,7 +109,7 @@
 				if(do_after(user, 50, target = H))
 					user.visible_message("<span class='notice'>[user] shaves his facial hair clean with the [src].</span>", \
 					"<span class='notice'>You finish shaving with the [src]. Fast and clean!</span>")
-					H.f_style = "Shaved"
+					C.f_style = "Shaved"
 					H.update_fhair()
 					playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
 			else
@@ -121,17 +121,17 @@
 					if(user_loc == user.loc && H_loc == H.loc)
 						user.visible_message("<span class='danger'>[user] shaves off [H]'s facial hair with \the [src].</span>", \
 						"<span class='notice'>You shave [H]'s facial hair clean off.</span>")
-						H.f_style = "Shaved"
+						C.f_style = "Shaved"
 						H.update_fhair()
 						playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
 		if(user.zone_sel.selecting == "head")
 			if(!get_location_accessible(H, "head"))
 				to_chat(user, "<span class='warning'>The headgear is in the way.</span>")
 				return
-			if((H.species && H.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+			if((C.species && C.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
 				to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of hair.</span>")
 				return
-			if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead")
+			if(C.h_style == "Bald" || C.h_style == "Balding Hair" || C.h_style == "Skinhead")
 				to_chat(user, "<span class='notice'>There is not enough hair left to shave...</span>")
 				return
 			if(H == user) //shaving yourself
@@ -140,7 +140,7 @@
 				if(do_after(user, 50, target = H))
 					user.visible_message("<span class='notice'>[user] shaves his head with the [src].</span>", \
 					"<span class='notice'>You finish shaving with the [src].</span>")
-					H.h_style = "Skinhead"
+					C.h_style = "Skinhead"
 					H.update_hair()
 					playsound(src.loc, 'sound/items/Welder2.ogg', 40, 1)
 			else
@@ -152,7 +152,7 @@
 					if(user_loc == user.loc && H_loc == H.loc)
 						user.visible_message("<span class='danger'>[user] shaves [H]'s head bald with \the [src]!</span>", \
 						"<span class='warning'>You shave [H]'s head bald.</span>")
-						H.h_style = "Skinhead"
+						C.h_style = "Skinhead"
 						H.update_hair()
 						playsound(src.loc, 'sound/items/Welder2.ogg', 40, 1)
 		else
@@ -30,21 +30,21 @@
 		//this is largely copypasted from there.
 		//handle facial hair (if necessary)
 		var/list/species_facial_hair = list()
-		var/obj/item/organ/external/head/C = H.organs_by_name["head"]
+		var/obj/item/organ/external/head/C = H.get_organ("head")
 		var/datum/robolimb/robohead = all_robolimbs[C.model]
 		if(H.gender == MALE || H.get_species() == "Vulpkanin")
-			if(H.species)
+			if(C.species)
 				for(var/i in facial_hair_styles_list)
 					var/datum/sprite_accessory/facial_hair/tmp_facial = facial_hair_styles_list[i]
-					if(H.species.name in tmp_facial.species_allowed)  //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human hair styles.
-						if(H.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
+					if(C.species.name in tmp_facial.species_allowed)  //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human hair styles.
+						if(C.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
 							if(robohead.is_monitor)
 								to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s face worth cutting. How disappointing.</span>")
 								return
 							continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
 						species_facial_hair += i
 					else
-						if(H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
+						if(C.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
 							if(!robohead.is_monitor)
 								if("Human" in tmp_facial.species_allowed)
 									species_facial_hair += i
@@ -56,18 +56,18 @@
 		var/f_new_style = input(user, "Select a facial hair style", "Grooming")  as null|anything in species_facial_hair
 		//handle normal hair
 		var/list/species_hair = list()
-		if(H.species)
+		if(C.species)
 			for(var/i in hair_styles_list)
 				var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
-				if(H.species.name in tmp_hair.species_allowed) //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human facial hair styles.
-					if(H.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
+				if(C.species.name in tmp_hair.species_allowed) //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human facial hair styles.
+					if(C.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
 						if(robohead.is_monitor)
 							to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s head worth cutting. How disappointing.</span>")
 							return
 						continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
 					species_hair += i
 				else
-					if(H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
+					if(C.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
 						if(!robohead.is_monitor)
 							if("Human" in tmp_hair.species_allowed)
 								species_hair += i
@@ -84,11 +84,12 @@
 				user.visible_message("<span class='notice'>[user] stops cutting [M]'s hair.</span>", "<span class='notice'>You stop cutting [M]'s hair.</span>")
 				return
 			if(f_new_style)
-				H.f_style = f_new_style
+				C.f_style = f_new_style
 			if(h_new_style)
-				H.h_style = h_new_style
+				C.h_style = h_new_style

 		H.update_hair()
+		H.update_fhair()
 		user.visible_message("<span class='notice'>[user] finishes cutting [M]'s hair!</span>")

 /obj/item/weapon/scissors/safety //Totally safe, I assure you.
@@ -17,6 +17,7 @@
 		if(!AC)
 			AC = new(src, user)
 			AC.name = "SalonPro Nano-Mirror&trade;"
+			AC.flags = APPEARANCE_ALL_BODY
 			ui_users[user] = AC
 		AC.ui_interact(user)

@@ -148,6 +148,7 @@ var/send_emergency_team

 /client/proc/create_response_team(obj/spawn_location)
 	var/mob/living/carbon/human/M = new(null)
+	var/obj/item/organ/external/head/head_organ = M.get_organ("head")
 	response_team_members |= M

 	var/new_gender = alert(usr, "Please select your gender.", "Character Generation", "Male", "Female")
@@ -173,18 +174,18 @@ var/send_emergency_team
 		if(prob(5))
 			facial_hair_style = pick(facial_hair_styles_list)

-	M.r_facial = hex2num(copytext(hair_c, 2, 4))
-	M.g_facial = hex2num(copytext(hair_c, 4, 6))
-	M.b_facial = hex2num(copytext(hair_c, 6, 8))
-	M.r_hair = hex2num(copytext(hair_c, 2, 4))
-	M.g_hair = hex2num(copytext(hair_c, 4, 6))
-	M.b_hair = hex2num(copytext(hair_c, 6, 8))
+	head_organ.r_facial = hex2num(copytext(hair_c, 2, 4))
+	head_organ.g_facial = hex2num(copytext(hair_c, 4, 6))
+	head_organ.b_facial = hex2num(copytext(hair_c, 6, 8))
+	head_organ.r_hair = hex2num(copytext(hair_c, 2, 4))
+	head_organ.g_hair = hex2num(copytext(hair_c, 4, 6))
+	head_organ.b_hair = hex2num(copytext(hair_c, 6, 8))
 	M.r_eyes = hex2num(copytext(eye_c, 2, 4))
 	M.g_eyes = hex2num(copytext(eye_c, 4, 6))
 	M.b_eyes = hex2num(copytext(eye_c, 6, 8))
 	M.s_tone = skin_tone
-	M.h_style = hair_style
-	M.f_style = facial_hair_style
+	head_organ.h_style = hair_style
+	head_organ.f_style = facial_hair_style

 	M.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]"
 	M.name = M.real_name
@@ -498,6 +498,7 @@ client/proc/one_click_antag()
 /datum/admins/proc/create_vox_raider(obj/spawn_location, leader_chosen = 0)

 	var/mob/living/carbon/human/new_vox = new(spawn_location.loc, "Vox")
+	var/obj/item/organ/external/head/head_organ = new_vox.get_organ("head")

 	var/sounds = rand(2,8)
 	var/i = 0
@@ -516,8 +517,8 @@ client/proc/one_click_antag()
 	new_vox.add_language("Vox-pidgin")
 	new_vox.add_language("Galactic Common")
 	new_vox.add_language("Tradeband")
-	new_vox.h_style = "Short Vox Quills"
-	new_vox.f_style = "Shaved"
+	head_organ.h_style = "Short Vox Quills"
+	head_organ.f_style = "Shaved"

 	for(var/obj/item/organ/external/limb in new_vox.organs)
 		limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
@@ -1603,7 +1603,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				if("nanoui")
 					nanoui_fancy = !nanoui_fancy

-				if("ghost_att_anim")
+				if("ghost_att_anim")
 					show_ghostitem_attack = !show_ghostitem_attack

 				if("UIcolor")
@@ -1726,13 +1726,19 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	character.g_eyes = g_eyes
 	character.b_eyes = b_eyes

-	character.r_hair = r_hair
-	character.g_hair = g_hair
-	character.b_hair = b_hair
+	//Head-specific
+	var/obj/item/organ/external/head/H = character.get_organ("head")
+	H.r_hair = r_hair
+	H.g_hair = g_hair
+	H.b_hair = b_hair

-	character.r_facial = r_facial
-	character.g_facial = g_facial
-	character.b_facial = b_facial
+	H.r_facial = r_facial
+	H.g_facial = g_facial
+	H.b_facial = b_facial
+
+	H.h_style = h_style
+	H.f_style = f_style
+	//End of head-specific.

 	character.r_skin = r_skin
 	character.g_skin = g_skin
@@ -1740,9 +1746,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts

 	character.s_tone = s_tone

-	character.h_style = h_style
-	character.f_style = f_style
-
 	// Destroy/cyborgize organs
 	for(var/name in organ_data)

@@ -1819,10 +1822,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	character.socks = socks

 	if(character.species.bodyflags & HAS_HEAD_ACCESSORY)
-		character.r_headacc = r_headacc
-		character.g_headacc = g_headacc
-		character.b_headacc = b_headacc
-		character.ha_style = ha_style
+		H.r_headacc = r_headacc
+		H.g_headacc = g_headacc
+		H.b_headacc = b_headacc
+		H.ha_style = ha_style
 	if(character.species.bodyflags & HAS_MARKINGS)
 		character.r_markings = r_markings
 		character.g_markings = g_markings
@@ -176,9 +176,11 @@

 /obj/item/clothing/head/kitty/update_icon(var/mob/living/carbon/human/user)
 	if(!istype(user)) return
+	var/obj/item/organ/external/head/head_organ = user.get_organ("head")
+
 	mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty")
 //		mob2 = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty2") - Commented out because it seemingly does nothing.
-	mob.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
+	mob.Blend(rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair), ICON_ADD)
 //		mob2.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD) - Commented out because it seemingly does nothing.

 	var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
@@ -201,8 +203,9 @@

 /obj/item/clothing/head/kitty/mouse/update_icon(var/mob/living/carbon/human/user)
 	if(!istype(user)) return
+	var/obj/item/organ/external/head/head_organ = user.get_organ("head")
 	mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mousey")
-	mob.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
+	mob.Blend(rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair), ICON_ADD)

 	var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mouseyinner")
 	mob.Blend(earbit, ICON_OVERLAY)
@@ -18,16 +18,17 @@
 	return 1

 /mob/living/carbon/human/proc/change_gender(var/gender, var/update_dna = 1)
+	var/obj/item/organ/external/head/H = organs_by_name["head"]
 	if(src.gender == gender)
 		return

 	src.gender = gender

-	var/datum/sprite_accessory/hair/current_hair = hair_styles_list[h_style]
+	var/datum/sprite_accessory/hair/current_hair = hair_styles_list[H.h_style]
 	if(current_hair.gender != NEUTER && current_hair.gender != src.gender)
 		reset_head_hair()

-	var/datum/sprite_accessory/hair/current_fhair = facial_hair_styles_list[f_style]
+	var/datum/sprite_accessory/hair/current_fhair = facial_hair_styles_list[H.f_style]
 	if(current_fhair.gender != NEUTER && current_fhair.gender != src.gender)
 		reset_facial_hair()

@@ -38,59 +39,137 @@
 	return 1

 /mob/living/carbon/human/proc/change_hair(var/hair_style)
+	var/obj/item/organ/external/head/H = get_organ("head")
 	if(!hair_style)
 		return

-	if(h_style == hair_style)
+	if(H.h_style == hair_style)
 		return

 	if(!(hair_style in hair_styles_list))
 		return

-	h_style = hair_style
+	H.h_style = hair_style

 	update_hair()
 	return 1

 /mob/living/carbon/human/proc/change_facial_hair(var/facial_hair_style)
+	var/obj/item/organ/external/head/H = get_organ("head")
 	if(!facial_hair_style)
 		return

-	if(f_style == facial_hair_style)
+	if(H.f_style == facial_hair_style)
 		return

 	if(!(facial_hair_style in facial_hair_styles_list))
 		return

-	f_style = facial_hair_style
+	H.f_style = facial_hair_style

 	update_fhair()
 	return 1

+/mob/living/carbon/human/proc/change_head_accessory(var/head_accessory_style)
+	var/obj/item/organ/external/head/H = get_organ("head")
+	if(!head_accessory_style)
+		return
+
+	if(H.ha_style == head_accessory_style)
+		return
+
+	if(!(head_accessory_style in head_accessory_styles_list))
+		return
+
+	H.ha_style = head_accessory_style
+
+	update_head_accessory()
+	return 1
+
+/mob/living/carbon/human/proc/change_markings(var/marking_style)
+	if(!marking_style)
+		return
+
+	if(src.m_style == marking_style)
+		return
+
+	if(!(marking_style in marking_styles_list))
+		return
+
+	src.m_style = marking_style
+
+	update_markings()
+	return 1
+
+/mob/living/carbon/human/proc/change_body_accessory(var/body_accessory_style)
+	var/found
+	if(!body_accessory_style)
+		return
+
+	if(src.body_accessory)
+		if(src.body_accessory.name == body_accessory_style)
+			return
+
+	for(var/B in body_accessory_by_name)
+		if(B == body_accessory_style)
+			src.body_accessory = body_accessory_by_name[body_accessory_style]
+			found = 1
+
+	if(!found)
+		return
+
+	update_tail_layer()
+	return 1
+
 /mob/living/carbon/human/proc/reset_hair()
 	reset_head_hair()
 	reset_facial_hair()
+	reset_head_accessory()
+	if(m_style && m_style != "None") //Resets the markings if they were head markings.
+		var/datum/sprite_accessory/marking_style = marking_styles_list[m_style]
+		if(marking_style && marking_style.marking_location == "head")
+			reset_markings()

 /mob/living/carbon/human/proc/reset_head_hair()
+	var/obj/item/organ/external/head/H = get_organ("head")
 	var/list/valid_hairstyles = generate_valid_hairstyles()
-
 	if(valid_hairstyles.len)
-		h_style = pick(valid_hairstyles)
+		H.h_style = pick(valid_hairstyles)
 	else
 		//this shouldn't happen
-		h_style = "Bald"
+		H.h_style = "Bald"

 	update_hair()

 /mob/living/carbon/human/proc/reset_facial_hair()
+	var/obj/item/organ/external/head/H = get_organ("head")
 	var/list/valid_facial_hairstyles = generate_valid_facial_hairstyles()
 	if(valid_facial_hairstyles.len)
-		f_style = pick(valid_facial_hairstyles)
+		H.f_style = pick(valid_facial_hairstyles)
 	else
 		//this shouldn't happen
-		f_style = "Shaved"
+		H.f_style = "Shaved"
 	update_fhair()

+/mob/living/carbon/human/proc/reset_markings()
+	var/list/valid_markings = generate_valid_markings()
+	if(valid_markings.len)
+		m_style = pick(valid_markings)
+	else
+		//this shouldn't happen
+		m_style = "None"
+	update_markings()
+
+/mob/living/carbon/human/proc/reset_head_accessory()
+	var/obj/item/organ/external/head/H = get_organ("head")
+	var/list/valid_head_accessories = generate_valid_head_accessories()
+	if(valid_head_accessories.len)
+		H.ha_style = pick(valid_head_accessories)
+	else
+		//this shouldn't happen
+		H.ha_style = "None"
+	update_head_accessory()
+
 /mob/living/carbon/human/proc/change_eye_color(var/red, var/green, var/blue)
 	if(red == r_eyes && green == g_eyes && blue == b_eyes)
 		return
@@ -104,27 +183,53 @@
 	return 1

 /mob/living/carbon/human/proc/change_hair_color(var/red, var/green, var/blue)
-	if(red == r_eyes && green == g_eyes && blue == b_eyes)
+	var/obj/item/organ/external/head/H = get_organ("head")
+	if(red == H.r_hair && green == H.g_hair && blue == H.b_hair)
 		return

-	r_hair = red
-	g_hair = green
-	b_hair = blue
+	H.r_hair = red
+	H.g_hair = green
+	H.b_hair = blue

 	update_hair()
 	return 1

 /mob/living/carbon/human/proc/change_facial_hair_color(var/red, var/green, var/blue)
-	if(red == r_facial && green == g_facial && blue == b_facial)
+	var/obj/item/organ/external/head/H = get_organ("head")
+	if(red == H.r_facial && green == H.g_facial && blue == H.b_facial)
 		return

-	r_facial = red
-	g_facial = green
-	b_facial = blue
+	H.r_facial = red
+	H.g_facial = green
+	H.b_facial = blue

 	update_fhair()
 	return 1

+/mob/living/carbon/human/proc/change_head_accessory_color(var/red, var/green, var/blue)
+	var/obj/item/organ/external/head/H = get_organ("head")
+	if(red == H.r_headacc && green == H.g_headacc && blue == H.b_headacc)
+		return
+
+	H.r_headacc = red
+	H.g_headacc = green
+	H.b_headacc = blue
+
+	update_head_accessory()
+	return 1
+
+/mob/living/carbon/human/proc/change_marking_color(var/red, var/green, var/blue)
+	if(red == r_markings && green == g_markings && blue == b_markings)
+		return
+
+	r_markings = red
+	g_markings = green
+	b_markings = blue
+
+	update_markings()
+	return 1
+
+
 /mob/living/carbon/human/proc/change_skin_color(var/red, var/green, var/blue)
 	if(red == r_skin && green == g_skin && blue == b_skin || !(species.bodyflags & HAS_SKIN_COLOR))
 		return
@@ -170,6 +275,7 @@

 /mob/living/carbon/human/proc/generate_valid_hairstyles()
 	var/list/valid_hairstyles = new()
+	var/obj/item/organ/external/head/H = get_organ("head")
 	for(var/hairstyle in hair_styles_list)
 		var/datum/sprite_accessory/S = hair_styles_list[hairstyle]

@@ -177,12 +283,11 @@
 			continue
 		if(gender == FEMALE && S.gender == MALE)
 			continue
-		if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
-			var/obj/item/organ/external/head/H = organs_by_name["head"]
+		if(H.species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
 			var/datum/robolimb/robohead = all_robolimbs[H.model]
 			if(!H)
 				return
-			if(species.name in S.species_allowed) //If this is a hairstyle native to the user's species...
+			if(H.species.name in S.species_allowed) //If this is a hairstyle native to the user's species...
 				if(robohead.is_monitor && (robohead.company in S.models_allowed)) //Check to see if they have a head with an ipc-style screen and that the head's company is in the screen style's allowed models list.
 					valid_hairstyles += hairstyle //Give them their hairstyles if they do.
 					continue
@@ -195,8 +300,8 @@
 					if("Human" in S.species_allowed) //If the user has a robotic head and the hairstyle can fit humans, let them use it as a wig for their humanoid robot head.
 						valid_hairstyles += hairstyle
 					continue
-		else
-			if(!(species.name in S.species_allowed)) //If the user is not a species who can have robotic heads, use the default handling.
+		else //If the user is not a species who can have robotic heads, use the default handling.
+			if(!(H.species.name in S.species_allowed)) //If the user's head is not of a species the hair style allows, skip it. Otherwise, add it to the list.
 				continue
 			valid_hairstyles += hairstyle

@@ -204,6 +309,7 @@

 /mob/living/carbon/human/proc/generate_valid_facial_hairstyles()
 	var/list/valid_facial_hairstyles = new()
+	var/obj/item/organ/external/head/H = get_organ("head")
 	for(var/facialhairstyle in facial_hair_styles_list)
 		var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]

@@ -211,12 +317,11 @@
 			continue
 		if(gender == FEMALE && S.gender == MALE)
 			continue
-		if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
-			var/obj/item/organ/external/head/H = organs_by_name["head"]
+		if(H.species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
 			var/datum/robolimb/robohead = all_robolimbs[H.model]
 			if(!H)
 				continue // No head, no hair
-			if(species.name in S.species_allowed) //If this is a facial hair style native to the user's species...
+			if(H.species.name in S.species_allowed) //If this is a facial hair style native to the user's species...
 				if(robohead.is_monitor && (robohead.company in S.models_allowed)) //Check to see if they have a head with an ipc-style screen and that the head's company is in the screen style's allowed models list.
 					valid_facial_hairstyles += facialhairstyle //Give them their facial hair styles if they do.
 					continue
@@ -231,8 +336,52 @@
 						valid_facial_hairstyles += facialhairstyle
 					continue
 		else //If the user is not a species who can have robotic heads, use the default handling.
-			if(!(species.name in S.species_allowed))
+			if(!(H.species.name in S.species_allowed)) //If the user's head is not of a species the facial hair style allows, skip it. Otherwise, add it to the list.
 				continue
 			valid_facial_hairstyles += facialhairstyle

 	return valid_facial_hairstyles
+
+/mob/living/carbon/human/proc/generate_valid_head_accessories()
+	var/list/valid_head_accessories = new()
+	var/obj/item/organ/external/head/H = get_organ("head")
+	for(var/head_accessory in head_accessory_styles_list)
+		var/datum/sprite_accessory/S = head_accessory_styles_list[head_accessory]
+
+		if(!(H.species.name in S.species_allowed)) //If the user's head is not of a species the head accessory style allows, skip it. Otherwise, add it to the list.
+			continue
+		valid_head_accessories += head_accessory
+
+	return valid_head_accessories
+
+/mob/living/carbon/human/proc/generate_valid_markings()
+	var/list/valid_markings = new()
+	var/obj/item/organ/external/head/H = get_organ("head")
+	for(var/marking in marking_styles_list)
+		var/datum/sprite_accessory/S = marking_styles_list[marking]
+
+		if(!(species.name in S.species_allowed)) //If the user's head is not of a species the marking style allows, skip it. Otherwise, add it to the list.
+			continue
+		if(H.species.flags & ALL_RPARTS) //If the user is a species that can have a robotic head...
+			var/datum/robolimb/robohead = all_robolimbs[H.model]
+			if(!(S.models_allowed && (robohead.company in S.models_allowed))) //Make sure they don't get markings incompatible with their head.
+				continue
+		valid_markings += marking
+
+	return valid_markings
+
+/mob/living/carbon/human/proc/generate_valid_body_accessories()
+	var/list/valid_body_accessories = new()
+	for(var/B in body_accessory_by_name)
+		var/datum/body_accessory/A = body_accessory_by_name[B]
+		if(check_rights(R_ADMIN, 1, src))
+			valid_body_accessories = body_accessory_by_name.Copy()
+		else
+			if(!istype(A))
+				valid_body_accessories += "None" //The only null entry should be the "None" option.
+				continue
+			if(!(species.name in A.allowed_species)) //If the user is not of a species the body accessory style allows, skip it. Otherwise, add it to the list.
+				continue
+			valid_body_accessories += B
+
+	return valid_body_accessories
@@ -145,12 +145,13 @@
 	return ..(gibbed)

 /mob/living/carbon/human/proc/makeSkeleton()
+	var/obj/item/organ/external/head/H = get_organ("head")
 	if(SKELETON in src.mutations)	return

-	if(f_style)
-		f_style = "Shaved"
-	if(h_style)
-		h_style = "Bald"
+	if(H.f_style)
+		H.f_style = "Shaved"
+	if(H.h_style)
+		H.h_style = "Bald"
 	update_fhair(0)
 	update_hair(0)

@@ -162,12 +163,13 @@
 	return

 /mob/living/carbon/human/proc/ChangeToHusk()
+	var/obj/item/organ/external/head/H = organs_by_name["head"]
 	if(HUSK in mutations)	return

-	if(f_style)
-		f_style = "Shaved"		//we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
-	if(h_style)
-		h_style = "Bald"
+	if(H.f_style)
+		H.f_style = "Shaved"		//we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
+	if(H.h_style)
+		H.h_style = "Bald"
 	update_fhair(0)
 	update_hair(0)

@@ -74,38 +74,30 @@
 	status_flags = GODMODE|CANPUSH

 /mob/living/carbon/human/skrell/New(var/new_loc)
-	h_style = "Skrell Male Tentacles"
 	..(new_loc, "Skrell")

 /mob/living/carbon/human/tajaran/New(var/new_loc)
-	ha_style = "Tajaran Ears"
 	..(new_loc, "Tajaran")

 /mob/living/carbon/human/vulpkanin/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Vulpkanin")

 /mob/living/carbon/human/unathi/New(var/new_loc)
-	h_style = "Unathi Horns"
 	..(new_loc, "Unathi")

 /mob/living/carbon/human/vox/New(var/new_loc)
-	h_style = "Short Vox Quills"
 	..(new_loc, "Vox")

 /mob/living/carbon/human/voxarmalis/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Vox Armalis")

 /mob/living/carbon/human/skeleton/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Skeleton")

 /mob/living/carbon/human/kidan/New(var/new_loc)
 	..(new_loc, "Kidan")

 /mob/living/carbon/human/plasma/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Plasmaman")

 /mob/living/carbon/human/slime/New(var/new_loc)
@@ -121,31 +113,24 @@
 	..(new_loc, "Human")

 /mob/living/carbon/human/diona/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Diona")

 /mob/living/carbon/human/machine/New(var/new_loc)
-	h_style = "blue IPC screen"
 	..(new_loc, "Machine")

 /mob/living/carbon/human/shadow/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Shadow")

 /mob/living/carbon/human/golem/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Golem")

 /mob/living/carbon/human/wryn/New(var/new_loc)
-	h_style = "Antennae"
 	..(new_loc, "Wryn")

 /mob/living/carbon/human/nucleation/New(var/new_loc)
-	h_style = "Nucleation Crystals"
 	..(new_loc, "Nucleation")

 /mob/living/carbon/human/drask/New(var/new_loc)
-	h_style = "Bald"
 	..(new_loc, "Drask")

 /mob/living/carbon/human/monkey/New(var/new_loc)
@@ -1505,6 +1490,15 @@

 	species.create_organs(src)

+	//Handle default hair/head accessories for created mobs.
+	var/obj/item/organ/external/head/H = get_organ("head")
+	if(species.default_hair)
+		H.h_style = species.default_hair
+	if(species.default_fhair)
+		H.f_style = species.default_fhair
+	if(species.default_headacc)
+		H.ha_style = species.default_headacc
+
 	if(!dna)
 		dna = new /datum/dna(null)
 		dna.species = species.name
@@ -1601,9 +1595,8 @@
 		return

 	if(species.flags & ALL_RPARTS) //If they can have a fully cybernetic body...
-		var/obj/item/organ/external/head/H = organs_by_name["head"]
-		var/datum/robolimb/robohead = all_robolimbs[H.model]
-		if(!H)
+		var/datum/robolimb/robohead = all_robolimbs[head_organ.model]
+		if(!head_organ)
 			return
 		if(!robohead.is_monitor) //If they've got a prosthetic head and it isn't a monitor, they've no screen to adjust. Instead, let them change the colour of their optics!
 			var/optic_colour = input(src, "Select optic colour", rgb(r_markings, g_markings, b_markings)) as color|null
@@ -1620,15 +1613,15 @@
 			var/list/hair = list()
 			for(var/i in hair_styles_list)
 				var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
-				if((species.name in tmp_hair.species_allowed) && (robohead.company in tmp_hair.models_allowed)) //Populate the list of available monitor styles only with styles that the monitor-head is allowed to use.
+				if((head_organ.species.name in tmp_hair.species_allowed) && (robohead.company in tmp_hair.models_allowed)) //Populate the list of available monitor styles only with styles that the monitor-head is allowed to use.
 					hair += i

-			var/new_style = input(src, "Select a monitor display", "Monitor Display", h_style)  as null|anything in hair
+			var/new_style = input(src, "Select a monitor display", "Monitor Display", head_organ.h_style)  as null|anything in hair
 			if(incapacitated())
 				to_chat(src, "<span class='warning'>You were interrupted while changing your monitor display.</span>")
 				return
 			if(new_style)
-				h_style = new_style
+				head_organ.h_style = new_style

 		update_hair()

@@ -9,24 +9,6 @@ var/global/default_martial_art = new/datum/martial_art
 	var/b_markings = 0
 	var/m_style = "None"

-	//Hair colour and style
-	var/r_hair = 0
-	var/g_hair = 0
-	var/b_hair = 0
-	var/h_style = "Bald"
-
-	//Head accessory colour and style
-	var/r_headacc = 0
-	var/g_headacc = 0
-	var/b_headacc = 0
-	var/ha_style = "None"
-
-	//Facial hair colour and style
-	var/r_facial = 0
-	var/g_facial = 0
-	var/b_facial = 0
-	var/f_style = "Shaved"
-
 	//Eye colour
 	var/r_eyes = 0
 	var/g_eyes = 0
@@ -45,6 +45,8 @@
 	base_color = "#704300"
 	flesh_color = "#704300"
 	blood_color = "#FFFF99"
+	//Default styles for created mobs.
+	default_hair = "Antennae"


 /datum/species/wryn/handle_death(var/mob/living/carbon/human/H)
@@ -54,6 +56,7 @@
 			to_chat(C, "<span class='danger'>It feels like part of you has died.</span>")

 /datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M)
+	var/obj/item/organ/external/head/head_organ = H.get_organ("head")
 	if(M.a_intent == I_HARM)
 		if(H.handcuffed)
 			if(!H.get_int_organ(/obj/item/organ/internal/wryn/hivenode))	return
@@ -71,7 +74,7 @@
 				to_chat(M, "<span class='notice'>You hear a loud crunch as you mercilessly pull off [H]'s antennae.</span>")
 				to_chat(H, "<span class='danger'><B>You hear a loud crunch as your antennae is ripped off your head by [M].</span></B>")
 				to_chat(H, "<span class='danger'><span class='danger'><B>It's so quiet...</B></span>")
-				H.h_style = "Bald"
+				head_organ.h_style = "Bald"
 				H.update_hair()

 				M.attack_log += text("\[[time_stamp()]\] <font color='red'>removed antennae [H.name] ([H.ckey])</font>")
@@ -87,7 +90,7 @@
 	blurb = "A sub-race of unforunates who have been exposed to too much supermatter radiation. As a result, \
 	supermatter crystal clusters have begun to grow across their bodies. Research to find a cure for this ailment \
 	has been slow, and so this is a common fate for veteran engineers. The supermatter crystals produce oxygen, \
-	negating the need for the individual to breath. Their massive change in biology, however, renders most medicines \
+	negating the need for the individual to breathe. Their massive change in biology, however, renders most medicines \
 	obselete. Ionizing radiation seems to cause resonance in some of their crystals, which seems to encourage regeneration \
 	and produces a calming effect on the individual. Nucleations are highly stigmatized, and are treated much in the same \
 	way as lepers were back on Earth."
@@ -97,6 +100,9 @@
 	flags = IS_WHITELISTED | NO_BREATHE | NO_BLOOD | NO_PAIN | HAS_LIPS | NO_SCAN
 	dietflags = DIET_OMNI		//still human at their core, so they maintain their eating habits and diet

+	//Default styles for created mobs.
+	default_hair = "Nucleation Crystals"
+
 	reagent_tag = PROCESS_ORG
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart,
@@ -118,6 +118,11 @@
 	var/male_scream_sound = 'sound/goonstation/voice/male_scream.ogg'
 	var/female_scream_sound = 'sound/goonstation/voice/female_scream.ogg'

+	//Default hair/headacc style vars.
+	var/default_hair = "Bald" 		//Default hair style for newly created humans unless otherwise set.
+	var/default_fhair = "Shaved"	//Default facial hair style for newly created humans unless otherwise set.
+	var/default_headacc = "None"	//Default head accessory style for newly created humans unless otherwise set.
+
                              // Determines the organs that the species spawns with and
 	var/list/has_organ = list(    // which required-organ checks are conducted.
 		"heart" =    /obj/item/organ/internal/heart,
@@ -158,7 +163,6 @@

 /datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.

-
 	for(var/obj/item/organ/internal/iorgan in H.internal_organs)
 		if(iorgan in H.internal_organs)
 			qdel(iorgan)
@@ -55,6 +55,8 @@
 	flesh_color = "#34AF10"
 	reagent_tag = PROCESS_ORG
 	base_color = "#066000"
+	//Default styles for created mobs.
+	default_hair = "Unathi Horns"

 	allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
 								 /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble)
@@ -109,6 +111,8 @@
 	reagent_tag = PROCESS_ORG
 	flesh_color = "#AFA59E"
 	base_color = "#333333"
+	//Default styles for created mobs.
+	default_headacc = "Tajaran Ears"

 	allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/chick, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot,
 								 /mob/living/simple_animal/tribble)
@@ -189,6 +193,8 @@
 	dietflags = DIET_HERB
 	flesh_color = "#8CD7A3"
 	blood_color = "#1D2CBF"
+	//Default styles for created mobs.
+	default_hair = "Skrell Male Tentacles"
 	reagent_tag = PROCESS_ORG

 	suicide_messages = list(
@@ -251,6 +257,8 @@

 	blood_color = "#2299FC"
 	flesh_color = "#808D11"
+	//Default styles for created mobs.
+	default_hair = "Short Vox Quills"

 	reagent_tag = PROCESS_ORG
 	scream_verb = "shrieks"
@@ -751,6 +759,8 @@
 	dietflags = 0		//IPCs can't eat, so no diet
 	blood_color = "#1F181F"
 	flesh_color = "#AAAAAA"
+	//Default styles for created mobs.
+	default_hair = "Blue IPC Screen"
 	virus_immune = 1
 	can_revive_by_healing = 1
 	reagent_tag = PROCESS_SYN
@@ -791,6 +801,10 @@
 		)

 /datum/species/machine/handle_death(var/mob/living/carbon/human/H)
-	H.h_style = ""
+	var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+	head_organ.h_style = "Bald"
+	head_organ.f_style = "Shaved"
 	spawn(100)
-		if(H) H.update_hair()
+		if(H)
+			H.update_hair()
+			H.update_fhair()
@@ -393,13 +393,13 @@ var/global/list/damage_icon_parts = list()
 	//base icons
 	var/icon/head_accessory_standing	= new /icon('icons/mob/body_accessory.dmi',"accessory_none_s")

-	if(ha_style && (src.species.bodyflags & HAS_HEAD_ACCESSORY))
-		var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[ha_style]
+	if(head_organ.ha_style && (head_organ.species.bodyflags & HAS_HEAD_ACCESSORY))
+		var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[head_organ.ha_style]
 		if(head_accessory_style && head_accessory_style.species_allowed)
-			if(src.species.name in head_accessory_style.species_allowed)
+			if(head_organ.species.name in head_accessory_style.species_allowed)
 				var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
 				if(head_accessory_style.do_colouration)
-					head_accessory_s.Blend(rgb(r_headacc, g_headacc, b_headacc), ICON_ADD)
+					head_accessory_s.Blend(rgb(head_organ.r_headacc, head_organ.g_headacc, head_organ.b_headacc), ICON_ADD)
 				head_accessory_standing = head_accessory_s //head_accessory_standing.Blend(head_accessory_s, ICON_OVERLAY)
 														   //Having it this way preserves animations. Useful for animated antennae.
 		else
@@ -429,17 +429,17 @@ var/global/list/damage_icon_parts = list()
 	var/icon/hair_standing	= new /icon('icons/mob/human_face.dmi',"bald_s")
 	//var/icon/debrained_s = new /icon("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s")

-	if(h_style && !(head && (head.flags & BLOCKHEADHAIR) && !(isSynthetic())))
-		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
+	if(head_organ.h_style && !(head && (head.flags & BLOCKHEADHAIR) && !(isSynthetic())))
+		var/datum/sprite_accessory/hair_style = hair_styles_list[head_organ.h_style]
 		//if(!src.get_int_organ(/obj/item/organ/internal/brain) && src.get_species() != "Machine" )//make it obvious we have NO BRAIN
 		//	hair_standing.Blend(debrained_s, ICON_OVERLAY)
 		if(hair_style && hair_style.species_allowed)
-			if((src.species.name in hair_style.species_allowed) || (src.species.flags & ALL_RPARTS))
+			if((head_organ.species.name in hair_style.species_allowed) || (head_organ.species.flags & ALL_RPARTS)) //If the head's species is in the list of allowed species for the hairstyle, or the head's species is one flagged to have bodies comprised wholly of cybernetics...
 				var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
-				if(src.get_species() == "Slime People") // I am el worstos
+				if(head_organ.species.name == "Slime People") // I am el worstos
 					hair_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_AND)
 				else if(hair_style.do_colouration)
-					hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+					hair_s.Blend(rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair), ICON_ADD)

 				hair_standing = hair_s //hair_standing.Blend(hair_s, ICON_OVERLAY)
 									   //Having it this way preserves animations. Useful for IPC screens.
@@ -470,15 +470,15 @@ var/global/list/damage_icon_parts = list()
 	//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(head_organ.f_style)
+		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[head_organ.f_style]
 		if(facial_hair_style && facial_hair_style.species_allowed)
-			if((src.species.name in facial_hair_style.species_allowed) || (src.species.flags & ALL_RPARTS))
+			if((head_organ.species.name in facial_hair_style.species_allowed) || (head_organ.species.flags & ALL_RPARTS)) //If the head's species is in the list of allowed species for the hairstyle, or the head's species is one flagged to have bodies comprised wholly of cybernetics...
 				var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
-				if(src.get_species() == "Slime People") // I am el worstos
+				if(head_organ.species.name == "Slime People") // I am el worstos
 					facial_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_AND)
 				else if(facial_hair_style.do_colouration)
-					facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+					facial_s.Blend(rgb(head_organ.r_facial, head_organ.g_facial, head_organ.b_facial), ICON_ADD)
 				face_standing.Blend(facial_s, ICON_OVERLAY)
 		else
 			//warning("Invalid f_style for [species.name]: [f_style]")
@@ -1265,22 +1265,23 @@ var/global/list/damage_icon_parts = list()
 //gender no longer matters for the mouth, although there should probably be seperate base head icons.
 //	var/g = "m"
 //	if (gender == FEMALE)	g = "f"
-
+	var/obj/item/organ/external/head/H = get_organ("head")
 	//base icons
 	var/icon/face_lying		= new /icon('icons/mob/human_face.dmi',"bald_l")

-	if(f_style)
-		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
+
+	if(H.f_style)
+		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[H.f_style]
 		if(facial_hair_style)
 			var/icon/facial_l = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_l")
-			facial_l.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+			facial_l.Blend(rgb(H.r_facial, H.g_facial, H.b_facial), ICON_ADD)
 			face_lying.Blend(facial_l, ICON_OVERLAY)

-	if(h_style)
-		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
+	if(H.h_style)
+		var/datum/sprite_accessory/hair_style = hair_styles_list[H.h_style]
 		if(hair_style)
 			var/icon/hair_l = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_l")
-			hair_l.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+			hair_l.Blend(rgb(H.r_hair, H.g_hair, H.b_hair), ICON_ADD)
 			face_lying.Blend(hair_l, ICON_OVERLAY)

 	//Eyes
@@ -148,6 +148,7 @@

 /obj/effect/proc_holder/spell/targeted/recruit/cast(list/targets)
 	for(var/mob/living/carbon/human/target in targets)
+		var/obj/item/organ/external/head/head_organ = target.get_organ("head")
 		if(ticker.mode.greyshirts.len >= 3)
 			to_chat(usr, "<span class='warning'>You have already recruited the maximum number of henchmen.</span>")
 		if(!in_range(usr, target))
@@ -210,8 +211,8 @@
 		to_chat(target, "<span class='deadsay'>You may not harm other Greyshirt or [usr]. However, you do not need to obey other Greyshirts.</span>")
 		ticker.mode.greyshirts += target.mind
 		target.set_species("Human")
-		target.h_style = "Bald"
-		target.f_style = "Shaved"
+		head_organ.h_style = "Bald"
+		head_organ.f_style = "Shaved"
 		target.s_tone = 35
 		target.r_eyes = 1
 		target.b_eyes = 1
@@ -886,12 +886,12 @@
 		species_allowed = list("Vox")

 	vox_quills_fluff
-		name = "Fluffy Quills"
+		name = "Fluffy Vox Quills"
 		icon_state = "vox_afro"
 		species_allowed = list("Vox")

 	vox_quills_mohawk
-		name = "Quill Mohawk"
+		name = "Vox Quill Mohawk"
 		icon_state = "vox_mohawk"
 		species_allowed = list("Vox")

@@ -910,6 +910,11 @@
 		icon_state = "vox_nights"
 		species_allowed = list("Vox")

+	vox_razor
+		name = "Vox Razorback"
+		icon_state = "vox_razor"
+		species_allowed = list("Vox")
+
 // Apollo-specific

 	//Wryn antennae
@@ -1893,22 +1898,22 @@
 	icon_state = "markings_tiger"

 /datum/sprite_accessory/body_markings/tigerhead
-	name = "Tiger Body + Head"
+	name = "Tiger Body and Head"
 	species_allowed = list("Unathi", "Tajaran", "Vulpkanin")
 	icon_state = "markings_tigerhead"

 /datum/sprite_accessory/body_markings/tigerheadface_taj
-	name = "Tajaran Tiger Body + Head + Face"
+	name = "Tajaran Tiger Body, Head and Face"
 	species_allowed = list("Tajaran")
 	icon_state = "markings_tigerheadface_taj"

 /datum/sprite_accessory/body_markings/tigerheadface_vulp
-	name = "Vulpkanin Tiger Body + Head + Face"
+	name = "Vulpkanin Tiger Body, Head and Face"
 	species_allowed = list("Vulpkanin")
 	icon_state = "markings_tigerheadface_vulp"

 /datum/sprite_accessory/body_markings/tigerheadface_una
-	name = "Unathi Tiger Body + Head + Face"
+	name = "Unathi Tiger Body, Head and Face"
 	species_allowed = list("Unathi")
 	icon_state = "markings_tigerheadface_una"

@@ -2,9 +2,13 @@
 	name = "Appearance Editor"
 	var/flags = APPEARANCE_ALL_HAIR
 	var/mob/living/carbon/human/owner = null
+	var/obj/item/organ/external/head/head_organ = null
 	var/list/valid_species = list()
 	var/list/valid_hairstyles = list()
 	var/list/valid_facial_hairstyles = list()
+	var/list/valid_head_accessories = list()
+	var/list/valid_marking_styles = list()
+	var/list/valid_body_accessories = list()

 	var/check_whitelist
 	var/list/whitelist
@@ -13,6 +17,7 @@
 /datum/nano_module/appearance_changer/New(var/location, var/mob/living/carbon/human/H, var/check_species_whitelist = 1, var/list/species_whitelist = list(), var/list/species_blacklist = list())
 	..()
 	owner = H
+	head_organ = owner.get_organ("head")
 	src.check_whitelist = check_species_whitelist
 	src.whitelist = species_whitelist
 	src.blacklist = species_blacklist
@@ -54,7 +59,7 @@
 				return 1
 	if(href_list["hair_color"])
 		if(can_change(APPEARANCE_HAIR_COLOR))
-			var/new_hair = input("Please select hair color.", "Hair Color", rgb(owner.r_hair, owner.g_hair, owner.b_hair)) as color|null
+			var/new_hair = input("Please select hair color.", "Hair Color", rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair)) as color|null
 			if(new_hair && can_still_topic(state))
 				var/r_hair = hex2num(copytext(new_hair, 2, 4))
 				var/g_hair = hex2num(copytext(new_hair, 4, 6))
@@ -69,7 +74,7 @@
 				return 1
 	if(href_list["facial_hair_color"])
 		if(can_change(APPEARANCE_FACIAL_HAIR_COLOR))
-			var/new_facial = input("Please select facial hair color.", "Facial Hair Color", rgb(owner.r_facial, owner.g_facial, owner.b_facial)) as color|null
+			var/new_facial = input("Please select facial hair color.", "Facial Hair Color", rgb(head_organ.r_facial, head_organ.g_facial, head_organ.b_facial)) as color|null
 			if(new_facial && can_still_topic(state))
 				var/r_facial = hex2num(copytext(new_facial, 2, 4))
 				var/g_facial = hex2num(copytext(new_facial, 4, 6))
@@ -87,6 +92,41 @@
 				if(owner.change_eye_color(r_eyes, g_eyes, b_eyes))
 					update_dna()
 					return 1
+	if(href_list["head_accessory"])
+		if(can_change_head_accessory() && (href_list["head_accessory"] in valid_head_accessories))
+			if(owner.change_head_accessory(href_list["head_accessory"]))
+				update_dna()
+				return 1
+	if(href_list["head_accessory_color"])
+		if(can_change_head_accessory())
+			var/new_head_accessory = input("Please select head accessory color.", "Head Accessory Color", rgb(head_organ.r_headacc, head_organ.g_headacc, head_organ.b_headacc)) as color|null
+			if(new_head_accessory && can_still_topic(state))
+				var/r_headacc = hex2num(copytext(new_head_accessory, 2, 4))
+				var/g_headacc = hex2num(copytext(new_head_accessory, 4, 6))
+				var/b_headacc = hex2num(copytext(new_head_accessory, 6, 8))
+				if(owner.change_head_accessory_color(r_headacc, g_headacc, b_headacc))
+					update_dna()
+					return 1
+	if(href_list["marking"])
+		if(can_change_markings() && (href_list["marking"] in valid_marking_styles))
+			if(owner.change_markings(href_list["marking"]))
+				update_dna()
+				return 1
+	if(href_list["marking_color"])
+		if(can_change_markings())
+			var/new_markings = input("Please select marking color.", "Marking Color", rgb(owner.r_markings, owner.g_markings, owner.b_markings)) as color|null
+			if(new_markings && can_still_topic(state))
+				var/r_markings = hex2num(copytext(new_markings, 2, 4))
+				var/g_markings = hex2num(copytext(new_markings, 4, 6))
+				var/b_markings = hex2num(copytext(new_markings, 6, 8))
+				if(owner.change_marking_color(r_markings, g_markings, b_markings))
+					update_dna()
+					return 1
+	if(href_list["body_accessory"])
+		if(can_change_body_accessory() && (href_list["body_accessory"] in valid_body_accessories))
+			if(owner.change_body_accessory(href_list["body_accessory"]))
+				update_dna()
+				return 1

 	return 0

@@ -107,13 +147,21 @@
 	data["change_skin_tone"] = can_change_skin_tone()
 	data["change_skin_color"] = can_change_skin_color()
 	data["change_eye_color"] = can_change(APPEARANCE_EYE_COLOR)
+	data["change_head_accessory"] = can_change_head_accessory()
+	if(data["change_head_accessory"])
+		var/head_accessory_styles[0]
+		for(var/head_accessory_style in valid_head_accessories)
+			head_accessory_styles[++head_accessory_styles.len] = list("headaccessorystyle" = head_accessory_style)
+		data["head_accessory_styles"] = head_accessory_styles
+		data["head_accessory_style"] = head_organ.ha_style
+
 	data["change_hair"] = can_change(APPEARANCE_HAIR)
 	if(data["change_hair"])
 		var/hair_styles[0]
 		for(var/hair_style in valid_hairstyles)
 			hair_styles[++hair_styles.len] = list("hairstyle" = hair_style)
 		data["hair_styles"] = hair_styles
-		data["hair_style"] = owner.h_style
+		data["hair_style"] = head_organ.h_style

 	data["change_facial_hair"] = can_change(APPEARANCE_FACIAL_HAIR)
 	if(data["change_facial_hair"])
@@ -121,10 +169,31 @@
 		for(var/facial_hair_style in valid_facial_hairstyles)
 			facial_hair_styles[++facial_hair_styles.len] = list("facialhairstyle" = facial_hair_style)
 		data["facial_hair_styles"] = facial_hair_styles
-		data["facial_hair_style"] = owner.f_style
+		data["facial_hair_style"] = head_organ.f_style

+	data["change_markings"] = can_change_markings()
+	if(data["change_markings"])
+		var/marking_styles[0]
+		for(var/marking_style in valid_marking_styles)
+			marking_styles[++marking_styles.len] = list("markingstyle" = marking_style)
+		data["marking_styles"] = marking_styles
+		data["marking_style"] = owner.m_style
+
+	data["change_body_accessory"] = can_change_body_accessory()
+	if(data["change_body_accessory"])
+		var/body_accessory_styles[0]
+		for(var/body_accessory_style in valid_body_accessories)
+			body_accessory_styles[++body_accessory_styles.len] = list("bodyaccessorystyle" = body_accessory_style)
+		data["body_accessory_styles"] = body_accessory_styles
+		var/datum/body_accessory/BA
+		if(owner.body_accessory)
+			BA = owner.body_accessory.name
+		data["body_accessory_style"] = BA
+
+	data["change_head_accessory_color"] = can_change_head_accessory()
 	data["change_hair_color"] = can_change(APPEARANCE_HAIR_COLOR)
 	data["change_facial_hair_color"] = can_change(APPEARANCE_FACIAL_HAIR_COLOR)
+	data["change_marking_color"] = can_change_markings()
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
 		ui = new(user, src, ui_key, "appearance_changer.tmpl", "[src]", 800, 450, state = state)
@@ -145,10 +214,22 @@
 /datum/nano_module/appearance_changer/proc/can_change_skin_color()
 	return owner && (flags & APPEARANCE_SKIN) && (owner.species.bodyflags & HAS_SKIN_COLOR)

+/datum/nano_module/appearance_changer/proc/can_change_head_accessory()
+	return owner && (flags & APPEARANCE_HEAD_ACCESSORY) && (head_organ.species.bodyflags & HAS_HEAD_ACCESSORY)
+
+/datum/nano_module/appearance_changer/proc/can_change_markings()
+	return owner && (flags & APPEARANCE_MARKINGS) && (owner.species.bodyflags & HAS_MARKINGS)
+
+/datum/nano_module/appearance_changer/proc/can_change_body_accessory()
+	return owner && (flags & APPEARANCE_BODY_ACCESSORY) && (owner.species.bodyflags & HAS_TAIL)
+
 /datum/nano_module/appearance_changer/proc/cut_and_generate_data()
 	// Making the assumption that the available species remain constant
+	valid_hairstyles.Cut()
 	valid_facial_hairstyles.Cut()
-	valid_facial_hairstyles.Cut()
+	valid_head_accessories.Cut()
+	valid_marking_styles.Cut()
+	valid_body_accessories.Cut()
 	generate_data()

 /datum/nano_module/appearance_changer/proc/generate_data()
@@ -158,4 +239,10 @@
 		valid_species = owner.generate_valid_species(check_whitelist, whitelist, blacklist)
 	if(!valid_hairstyles.len || !valid_facial_hairstyles.len)
 		valid_hairstyles = owner.generate_valid_hairstyles()
-		valid_facial_hairstyles = owner.generate_valid_facial_hairstyles()
+		valid_facial_hairstyles = owner.generate_valid_facial_hairstyles()
+	if(!valid_head_accessories.len)
+		valid_head_accessories = owner.generate_valid_head_accessories()
+	if(!valid_marking_styles.len)
+		valid_marking_styles = owner.generate_valid_markings()
+	if(!valid_body_accessories.len)
+		valid_body_accessories = owner.generate_valid_body_accessories()
@@ -337,9 +337,10 @@
 	var/check = rand(0,100)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
-		if(check < 8 && H.h_style != "Very Long Beard")
-			H.h_style = "Very Long Hair"
-			H.f_style = "Very Long Beard"
+		var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+		if(check < 8 && head_organ.h_style != "Very Long Beard")
+			head_organ.h_style = "Very Long Hair"
+			head_organ.f_style = "Very Long Beard"
 			H.update_hair()
 			H.update_fhair()
 			H.visible_message("<span class='warning'>[H] has a wild look in their eyes!</span>")
@@ -198,12 +198,13 @@ datum/reagent/hair_dye
 datum/reagent/hair_dye/reaction_mob(var/mob/living/M, var/volume)
 	if(M && ishuman(M))
 		var/mob/living/carbon/human/H = M
-		H.r_facial = rand(0,255)
-		H.g_facial = rand(0,255)
-		H.b_facial = rand(0,255)
-		H.r_hair = rand(0,255)
-		H.g_hair = rand(0,255)
-		H.b_hair = rand(0,255)
+		var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+		head_organ.r_facial = rand(0,255)
+		head_organ.g_facial = rand(0,255)
+		head_organ.b_facial = rand(0,255)
+		head_organ.r_hair = rand(0,255)
+		head_organ.g_hair = rand(0,255)
+		head_organ.b_hair = rand(0,255)
 		H.update_hair()
 		H.update_fhair()
 	..()
@@ -228,8 +229,9 @@ datum/reagent/hairgrownium
 datum/reagent/hairgrownium/reaction_mob(var/mob/living/M, var/volume)
 	if(M && ishuman(M))
 		var/mob/living/carbon/human/H = M
-		H.h_style = random_hair_style(H.gender, H.species)
-		H.f_style = random_facial_hair_style(H.gender, H.species)
+		var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+		head_organ.h_style = random_hair_style(H.gender, head_organ.species.name)
+		head_organ.f_style = random_facial_hair_style(H.gender, head_organ.species.name)
 		H.update_hair()
 		H.update_fhair()
 	..()
@@ -252,12 +254,21 @@ datum/reagent/super_hairgrownium
 	result_amount = 3
 	mix_message = "The liquid becomes amazingly furry and smells peculiar."

-datum/reagent/super_hairgrownium/on_mob_life(var/mob/living/M as mob)
-	if(!M) M = holder.my_atom
+datum/reagent/super_hairgrownium/reaction_mob(var/mob/living/M, var/volume)
 	if(M && ishuman(M))
 		var/mob/living/carbon/human/H = M
-		H.h_style = "Very Long Hair"
-		H.f_style = "Very Long Beard"
+		var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+		var/datum/sprite_accessory/tmp_hair_style = hair_styles_list["Very Long Hair"]
+		var/datum/sprite_accessory/tmp_facial_hair_style = facial_hair_styles_list["Very Long Beard"]
+
+		if(head_organ.species.name in tmp_hair_style.species_allowed) //If 'Very Long Hair' is a style the person's species can have, give it to them.
+			head_organ.h_style = "Very Long Hair"
+		else //Otherwise, give them a random hair style.
+			head_organ.h_style = random_hair_style(H.gender, head_organ.species.name)
+		if(head_organ.species.name in tmp_facial_hair_style.species_allowed) //If 'Very Long Beard' is a style the person's species can have, give it to them.
+			head_organ.f_style = "Very Long Beard"
+		else //Otherwise, give them a random facial hair style.
+			head_organ.f_style = random_facial_hair_style(H.gender, head_organ.species.name)
 		H.update_hair()
 		H.update_fhair()
 		if(!H.wear_mask || H.wear_mask && !istype(H.wear_mask, /obj/item/clothing/mask/fakemoustache))
@@ -97,10 +97,12 @@
 	E.forceMove(target)
 	if(target.get_species() == "Machine")//as this is the only step needed for ipc put togethers
 		if(target_zone == "head")
-			var/obj/item/organ/external/head/H = target.organs_by_name["head"]
+			var/obj/item/organ/external/head/H = target.get_organ("head")
 			var/datum/robolimb/robohead = all_robolimbs[H.model]
 			if(robohead.is_monitor) //Ensures that if an IPC gets a head that's got a human hair wig attached to their body, the hair won't wipe.
-				target.h_style = ""
+				H.h_style = ""
+				H.f_style = ""
+				target.m_style = ""
 		E.status &= ~ORGAN_DESTROYED
 		if(E.children)
 			for(var/obj/item/organ/external/C in E.children)
@@ -54,6 +54,7 @@ var/global/list/limb_icon_cache = list()
 	overlays.Cut()
 	if(!owner)
 		return
+	var/obj/item/organ/external/head/H = owner.get_organ("head")

 	if(species.has_organ["eyes"])
 		var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_organs_by_name["eyes"]
@@ -79,32 +80,32 @@ var/global/list/limb_icon_cache = list()
 				markings_s.Blend(rgb(owner.r_markings, owner.g_markings, owner.b_markings), ICON_ADD)
 			overlays |= markings_s

-	if(owner.ha_style)
-		var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[owner.ha_style]
-		if(head_accessory_style && head_accessory_style.species_allowed && (species.name in head_accessory_style.species_allowed))
+	if(H.ha_style)
+		var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[H.ha_style]
+		if(head_accessory_style && head_accessory_style.species_allowed && (H.species.name in head_accessory_style.species_allowed))
 			var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
 			if(head_accessory_style.do_colouration)
-				head_accessory_s.Blend(rgb(owner.r_headacc, owner.g_headacc, owner.b_headacc), ICON_ADD)
+				head_accessory_s.Blend(rgb(H.r_headacc, H.g_headacc, H.b_headacc), ICON_ADD)
 			overlays |= head_accessory_s

-	if(owner.f_style)
-		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[owner.f_style]
-		if(facial_hair_style && ((facial_hair_style.species_allowed && (species.name in facial_hair_style.species_allowed)) || (src.species.flags & ALL_RPARTS)))
+	if(H.f_style)
+		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[H.f_style]
+		if(facial_hair_style && ((facial_hair_style.species_allowed && (H.species.name in facial_hair_style.species_allowed)) || (src.species.flags & ALL_RPARTS)))
 			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
-			if(species.name == "Slime People") // I am el worstos
+			if(H.species.name == "Slime People") // I am el worstos
 				facial_s.Blend(rgb(owner.r_skin, owner.g_skin, owner.b_skin, 160), ICON_AND)
 			else if(facial_hair_style.do_colouration)
-				facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), ICON_ADD)
+				facial_s.Blend(rgb(H.r_facial, H.g_facial, H.b_facial), ICON_ADD)
 			overlays |= facial_s

-	if(owner.h_style && !(owner.head && (owner.head.flags & BLOCKHEADHAIR)))
-		var/datum/sprite_accessory/hair_style = hair_styles_list[owner.h_style]
-		if(hair_style && ((species.name in hair_style.species_allowed) || (src.species.flags & ALL_RPARTS)))
+	if(H.h_style && !(owner.head && (owner.head.flags & BLOCKHEADHAIR)))
+		var/datum/sprite_accessory/hair_style = hair_styles_list[H.h_style]
+		if(hair_style && ((H.species.name in hair_style.species_allowed) || (src.species.flags & ALL_RPARTS)))
 			var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
-			if(species.name == "Slime People") // I am el worstos
+			if(H.species.name == "Slime People") // I am el worstos
 				hair_s.Blend(rgb(owner.r_skin, owner.g_skin, owner.b_skin, 160), ICON_AND)
 			else if(hair_style.do_colouration)
-				hair_s.Blend(rgb(owner.r_hair, owner.g_hair, owner.b_hair), ICON_ADD)
+				hair_s.Blend(rgb(H.r_hair, H.g_hair, H.b_hair), ICON_ADD)
 			overlays |= hair_s

 	return mob_icon
@@ -499,18 +499,19 @@

 	if(istype(owner, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = owner
-		if(!(H.h_style == "Very Long Hair" || H.h_style == "Mowhawk"))
+		var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+		if(!(head_organ.h_style == "Very Long Hair" || head_organ.h_style == "Mohawk"))
 			if(prob(10))
-				H.h_style = "Mohawk"
+				head_organ.h_style = "Mohawk"
 			else
-				H.h_style = "Very Long Hair"
-			H.r_hair = 216
-			H.g_hair = 192
-			H.b_hair = 120
+				head_organ.h_style = "Very Long Hair"
+			head_organ.r_hair = 216
+			head_organ.g_hair = 192
+			head_organ.b_hair = 120
 			H.update_hair()
-		if(!(H.f_style == "Very Long Beard"))
-			H.f_style = "Very Long Beard"
-			H.r_facial = 216
-			H.g_facial = 192
-			H.b_facial = 120
+		if(!(head_organ.f_style == "Very Long Beard"))
+			head_organ.f_style = "Very Long Beard"
+			head_organ.r_facial = 216
+			head_organ.g_facial = 192
+			head_organ.b_facial = 120
 			H.update_fhair()
@@ -141,6 +141,24 @@
 	encased = "skull"
 	var/can_intake_reagents = 1

+	//Hair colour and style
+	var/r_hair = 0
+	var/g_hair = 0
+	var/b_hair = 0
+	var/h_style = "Bald"
+
+	//Head accessory colour and style
+	var/r_headacc = 0
+	var/g_headacc = 0
+	var/b_headacc = 0
+	var/ha_style = "None"
+
+	//Facial hair colour and style
+	var/r_facial = 0
+	var/g_facial = 0
+	var/b_facial = 0
+	var/f_style = "Shaved"
+
 /obj/item/organ/external/head/remove()
 	if(owner)
 		if(!istype(dna))
@@ -23,7 +23,7 @@
    </div>
 {{/if}}

-{{if data.change_eye_color || data.change_skin_tone || data.change_skin_color || data.change_hair_color || data.change_facial_hair_color}}
+{{if data.change_eye_color || data.change_skin_tone || data.change_skin_color || data.change_head_accessory_color || data.change_hair_color || data.change_facial_hair_color || data.change_marking_color}}
    <div class="item">
        <div class="itemLabelNarrow">
            Colors:
@@ -38,12 +38,31 @@
            {{if data.change_skin_color}}
                {{:helper.link('Change skin color', null, { 'skin_color' : 1})}}
            {{/if}}
+            {{if data.change_head_accessory_color}}
+                {{:helper.link('Change head accessory color', null, { 'head_accessory_color' : 1})}}
+            {{/if}}
            {{if data.change_hair_color}}
                {{:helper.link('Change hair color', null, { 'hair_color' : 1})}}
            {{/if}}
            {{if data.change_facial_hair_color}}
                {{:helper.link('Change facial hair color', null, { 'facial_hair_color' : 1})}}
            {{/if}}
+            {{if data.change_marking_color}}
+                {{:helper.link('Change marking color', null, { 'marking_color' : 1})}}
+            {{/if}}
+        </div>
+    </div>
+{{/if}}
+
+{{if data.change_head_accessory}}
+    <div class="item">
+        <div class="itemLabelNarrow">
+            Head accessory styles:
+        </div>
+        <div class="itemContentWide">
+            {{for data.head_accessory_styles}}
+                {{:helper.link(value.headaccessorystyle, null, { 'head_accessory' : value.headaccessorystyle}, null, data.head_accessory_style == value.headaccessorystyle ? 'selected' : null)}}
+            {{/for}}
        </div>
    </div>
 {{/if}}
@@ -73,3 +92,29 @@
        </div>
    </div>
 {{/if}}
+
+{{if data.change_markings}}
+    <div class="item">
+        <div class="itemLabelNarrow">
+            Marking styles:
+        </div>
+        <div class="itemContentWide">
+            {{for data.marking_styles}}
+                {{:helper.link(value.markingstyle, null, { 'marking' : value.markingstyle}, null, data.marking_style == value.markingstyle ? 'selected' : null)}}
+            {{/for}}
+        </div>
+    </div>
+{{/if}}
+
+{{if data.change_body_accessory}}
+    <div class="item">
+        <div class="itemLabelNarrow">
+            Body accessory styles:
+        </div>
+        <div class="itemContentWide">
+            {{for data.body_accessory_styles}}
+                {{:helper.link(value.bodyaccessorystyle, null, { 'body_accessory' : value.bodyaccessorystyle}, null, data.body_accessory_style == value.bodyaccessorystyle ? 'selected' : null)}}
+            {{/for}}
+        </div>
+    </div>
+{{/if}}