Fixes merge conflicts

code/modules/mob/dead/observer/observer.dm

@@ -12,6 +12,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 	stat = DEAD
 	density = 0
 	canmove = 0
+	alpha = 127
 	anchored = 1	//  don't get pushed around
 	invisibility = INVISIBILITY_OBSERVER
 	var/can_reenter_corpse
@@ -48,29 +49,19 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 		T = get_turf(body)				//Where is the body located?
 		attack_log = body.attack_log	//preserve our attack logs by copying them to our ghost
 
-		if(ishuman(body))
-			var/mob/living/carbon/human/H = body
-			icon = H.stand_icon
-			overlays = H.overlays_standing
-		else
-			icon = body.icon
-			icon_state = body.icon_state
-			overlays = body.overlays
-
-		alpha = 127
-		gender = body.gender
+		var/mutable_appearance/MA = copy_appearance(body) 
 		if(body.mind && body.mind.name)
-			name = body.mind.name
+			MA.name = body.mind.name
+		else if(body.real_name)
+			MA.name = body.real_name
 		else
-			if(body.real_name)
-				name = body.real_name
+			if(gender == MALE)
+				MA.name = capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names))
 			else
-				if(gender == MALE)
-					name = capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names))
-				else
-					name = capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
+				MA.name = capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
 
 		mind = body.mind	//we don't transfer the mind but we keep a reference to it.
+		appearance = MA
 
 	ghostimage = image(icon = icon, loc = src, icon_state = icon_state)
 	ghostimage.overlays = overlays
@@ -99,6 +90,36 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 		updateallghostimages()
 	return ..()
 
+// This seems stupid, but it's the easiest way to avoid absolutely ridiculous shit from happening
+// Copying an appearance directly from a mob includes it's verb list, it's invisibility, it's alpha, and it's density
+// You might recognize these things as "fucking ridiculous to put in an appearance"
+// You'd be right, but that's fucking BYOND for you.
+/mob/dead/observer/proc/copy_appearance(mutable_appearance/COPY)
+	var/mutable_appearance/MA = new(src)
+
+	MA.appearance_flags = COPY.appearance_flags
+	MA.blend_mode = COPY.blend_mode
+	MA.color = COPY.color
+	MA.dir = COPY.dir
+	MA.gender = COPY.gender
+	MA.icon = COPY.icon
+	MA.icon_state = COPY.icon_state
+	MA.layer = COPY.layer
+	MA.maptext = COPY.maptext
+	MA.maptext_width = COPY.maptext_width
+	MA.maptext_height = COPY.maptext_height
+	MA.maptext_x = COPY.maptext_x
+	MA.maptext_y = COPY.maptext_y
+	MA.mouse_opacity = COPY.mouse_opacity
+	MA.overlays = COPY.overlays
+	if(!isicon(MA.icon) && !LAZYLEN(MA.overlays)) // Gibbing/dusting/melting removes the icon before ghostize()ing the mob, so we need to account for that
+		MA.icon = initial(icon)
+		MA.icon_state = initial(icon_state)
+	MA.suffix = COPY.suffix
+	MA.underlays = COPY.underlays
+
+	. = MA
+
 /mob/dead/CanPass(atom/movable/mover, turf/target, height=0)
 	return 1
 

code/modules/mob/language.dm

@@ -281,6 +281,15 @@
 	flags = RESTRICTED | WHITELISTED
 	syllables = list("click","clack")
 
+/datum/language/kidan/get_random_name()
+	var/new_name = "[pick(list("Vrax", "Krek", "Vriz", "Zrik", "Zarak", "Click", "Zerk", "Drax", "Zven", "Drexx"))]"
+	new_name += ", "
+	new_name += "[pick(list("Noble", "Worker", "Scout", "Builder", "Farmer", "Gatherer", "Soldier", "Guard", "Prospector"))]"
+	new_name += " of Clan "
+	new_name += "[pick(list("Tristan", "Zarlan", "Clack", "Kkraz", "Zramn", "Orlan", "Zrax"))]"	//I ran out of ideas after the first two tbh -_-
+	return new_name
+
+
 /datum/language/slime
 	name = "Bubblish"
 	desc = "The language of slimes. It's a mixture of bubbling noises and pops. Very difficult to speak without mechanical aid for humans."

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

@@ -27,6 +27,7 @@
 	verbs += /mob/living/verb/lay_down
 	alien_organs += new /obj/item/organ/internal/brain/xeno
 	alien_organs += new /obj/item/organ/internal/xenos/hivenode
+	alien_organs += new /obj/item/organ/internal/ears
 	for(var/obj/item/organ/internal/I in alien_organs)
 		I.insert(src)
 	..()
@@ -132,6 +133,10 @@
 		// add some movement delay
 		move_delay_add = min(move_delay_add + round(amount / 2), 10) // a maximum delay of 10
 
+/mob/living/carbon/alien/movement_delay()
+	. = ..()
+	. += move_delay_add + config.alien_delay //move_delay_add is used to slow aliens with stuns
+
 /mob/living/carbon/alien/getDNA()
 	return null
 

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -27,11 +27,6 @@
 	add_language("Hivemind")
 	..()
 
-
-/mob/living/carbon/alien/humanoid/movement_delay()
-	. = ..()
-	. += move_delay_add + config.alien_delay //move_delay_add is used to slow aliens with stuns
-
 /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0)
 	if(..())
 		return 1
@@ -63,15 +58,12 @@
 
 			f_loss += 60
 
-			AdjustEarDamage(30)
-			AdjustEarDeaf(120)
-
+			AdjustEarDamage(30, 120)
 		if(3.0)
 			b_loss += 30
 			if(prob(50) && !shielded)
 				Paralyse(1)
-			AdjustEarDamage(15)
-			AdjustEarDeaf(60)
+			AdjustEarDamage(15, 60)
 
 	take_overall_damage(b_loss, f_loss)
 

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -78,14 +78,6 @@
 		else if(eye_blurry)	//blurry eyes heal slowly
 			AdjustEyeBlurry(-1)
 
-		//Ears
-		if(disabilities & DEAF)		//disabled-deaf, doesn't get better on its own
-			EarDeaf(1)
-		else if(ear_deaf)			//deafness, heals slowly over time
-			AdjustEarDeaf(-1)
-		else if(ear_damage < 25)	//ear damage heals slowly under this threshold. otherwise you'll need earmuffs
-			AdjustEarDamage(-0.05)
-
 		if(stuttering)
 			AdjustStuttering(-1)
 

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -33,13 +33,11 @@
 	..()
 	stat(null, "Progress: [amount_grown]/[max_grown]")
 
-
 /mob/living/carbon/alien/larva/adjustPlasma(amount)
 	if(stat != DEAD && amount > 0)
 		amount_grown = min(amount_grown + 1, max_grown)
 	..(amount)
 
-
 /mob/living/carbon/alien/larva/ex_act(severity)
 	..()
 
@@ -56,15 +54,13 @@
 
 			f_loss += 60
 
-			AdjustEarDamage(30)
-			AdjustEarDeaf(120)
+			AdjustEarDamage(30, 120)
 
 		if(3.0)
 			b_loss += 30
 			if(prob(50))
 				Paralyse(1)
-			AdjustEarDamage(15)
-			AdjustEarDeaf(60)
+			AdjustEarDamage(15, 60)
 
 	adjustBruteLoss(b_loss)
 	adjustFireLoss(f_loss)

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -46,14 +46,6 @@
 		else if(eye_blurry)	//blurry eyes heal slowly
 			AdjustEyeBlurry(-1)
 
-		//Ears
-		if(disabilities & DEAF)	//disabled-deaf, doesn't get better on its own
-			EarDeaf(1)
-		else if(ear_deaf)			//deafness, heals slowly over time
-			AdjustEarDeaf(-1)
-		else if(ear_damage < 25)	//ear damage heals slowly under this threshold.
-			AdjustEarDamage(-0.05)
-
 		if(stuttering)
 			AdjustStuttering(-1)
 

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -91,7 +91,7 @@
 		owner.overlays += overlay
 
 		spawn(6)
-			var/mob/living/carbon/alien/larva/new_xeno = new(owner.loc)
+			var/mob/living/carbon/alien/larva/new_xeno = new(owner.drop_location())
 			new_xeno.key = C.key
 			if(ticker && ticker.mode)
 				ticker.mode.xenos += new_xeno.mind

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

@@ -108,8 +108,5 @@ I'm using this for Stat to give it a more nifty interface to work with
 /mob/living/carbon/brain/can_safely_leave_loc()
 	return 0 //You're not supposed to be ethereal jaunting, brains
 
-/mob/living/carbon/brain/SetEarDamage() // no ears to damage or heal
-	return
-
-/mob/living/carbon/brain/SetEarDeaf()
-	return
+/mob/living/carbon/brain/can_hear()
+	. = TRUE

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

@@ -19,12 +19,6 @@
 	var/mmi_icon = 'icons/obj/assemblies.dmi'
 	var/mmi_icon_state = "mmi_full"
 
-/obj/item/organ/internal/brain/surgeryize()
-	if(!owner)
-		return
-	owner.SetEarDeaf(0)
-	owner.SetEarDamage(0) //Yeah, didn't you...hear? The ears are totally inside the brain.
-
 /obj/item/organ/internal/brain/xeno
 	name = "xenomorph brain"
 	desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"

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

@@ -7,6 +7,7 @@
 	var/obj/item/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call.
 
 /mob/living/carbon/human/New(loc)
+	icon = null // This is now handled by overlays -- we just keep an icon for the sake of the map editor.
 	if(length(args) > 1)
 		log_runtime(EXCEPTION("human/New called with more than 1 argument (REPORT THIS ENTIRE RUNTIME TO A CODER)"))
 	. = ..()
@@ -264,8 +265,7 @@
 				else valid_limbs -= processing_dismember
 
 			if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
-				AdjustEarDamage(30)
-				AdjustEarDeaf(120)
+				AdjustEarDamage(30, 120)
 			if(prob(70) && !shielded)
 				Paralyse(10)
 
@@ -289,8 +289,7 @@
 					else valid_limbs -= processing_dismember
 
 			if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
-				AdjustEarDamage(15)
-				AdjustEarDeaf(60)
+				AdjustEarDamage(15, 60)
 			if(prob(50) && !shielded)
 				Paralyse(10)
 
@@ -731,25 +730,22 @@
 
 								if(hasHUD(usr, "security") && setcriminal != "Cancel")
 									found_record = 1
-									var/their_name = R.fields["name"]
-									var/their_rank = R.fields["rank"]
 									if(R.fields["criminal"] == "*Execute*")
 										to_chat(usr, "<span class='warning'>Unable to modify the sec status of a person with an active Execution order. Use a security computer instead.</span>")
-									else
+									else 
+										var/rank
 										if(ishuman(usr))
 											var/mob/living/carbon/human/U = usr
-											R.fields["comments"] += "Set to [setcriminal] by [U.get_authentification_name()] ([U.get_assignment()]) on [current_date_string] [station_time_timestamp()] with comment: [t1]<BR>"
-										if(isrobot(usr))
+											rank = U.get_assignment()
+										else if(isrobot(usr))
 											var/mob/living/silicon/robot/U = usr
-											R.fields["comments"] += "Set to [setcriminal] by [U.name] ([U.modtype] [U.braintype]) on [current_date_string] [station_time_timestamp()] with comment: [t1]<BR>"
-										if(isAI(usr))
-											var/mob/living/silicon/ai/U = usr
-											R.fields["comments"] += "Set to [setcriminal] by [U.name] (artificial intelligence) on [current_date_string] [station_time_timestamp()] with comment: [t1]<BR>"
-
-										R.fields["criminal"] = setcriminal
-										log_admin("[key_name_admin(usr)] set secstatus of [their_rank] [their_name] to [setcriminal], comment: [t1]")
-										spawn()
-											sec_hud_set_security_status()
+											rank = "[U.modtype] [U.braintype]"
+										else if(isAI(usr))
+											rank = "AI"
+										set_criminal_status(usr, R, setcriminal, t1, rank)
+								break // Git out of the securiy records loop!
+						if(found_record)
+							break // Git out of the general records
 
 			if(!found_record)
 				to_chat(usr, "<span class='warning'>Unable to locate a data core entry for this person.</span>")
@@ -1527,8 +1523,9 @@
 	var/obj/item/organ/external/head/head_organ = get_organ("head")
 	var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style]
 	var/icon/hair = new /icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
-
-	return image(get_icon_difference(get_eyecon(), hair), layer = LIGHTING_LAYER + 1) //Cut the hair's pixels from the eyes icon so eyes covered by bangs stay hidden even while on a higher layer.
+	var/mutable_appearance/MA = mutable_appearance(get_icon_difference(get_eyecon(), hair), layer = LIGHTING_LAYER + 1)
+	MA.plane = LIGHTING_PLANE
+	return MA //Cut the hair's pixels from the eyes icon so eyes covered by bangs stay hidden even while on a higher layer.
 
 /*Used to check if eyes should shine in the dark. Returns the image of the eyes on the layer where they will appear to shine.
 Eyes need to have significantly high darksight to shine unless the mob has the XRAY vision mutation. Eyes will not shine if they are covered in any way.*/

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

@@ -786,20 +786,6 @@
 				AdjustEyeBlurry(-1)
 
 
-		//Ears
-		if(disabilities & DEAF)	//disabled-deaf, doesn't get better on its own
-			EarDeaf(1)
-
-		else if(ear_deaf)			//deafness, heals slowly over time
-			AdjustEarDeaf(-1)
-
-		else if(istype(l_ear, /obj/item/clothing/ears/earmuffs) || istype(r_ear, /obj/item/clothing/ears/earmuffs))	//resting your ears with earmuffs heals ear damage faster
-			AdjustEarDamage(-0.15)
-			EarDeaf(1)
-
-		else if(ear_damage < 25)	//ear damage heals slowly under this threshold. otherwise you'll need earmuffs
-			AdjustEarDamage(-0.05)
-
 		if(flying)
 			animate(src, pixel_y = pixel_y + 5 , time = 10, loop = 1, easing = SINE_EASING)
 			animate(pixel_y = pixel_y - 5, time = 10, loop = 1, easing = SINE_EASING)

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

@@ -153,6 +153,9 @@
 		"l_foot" = list("path" = /obj/item/organ/external/foot),
 		"r_foot" = list("path" = /obj/item/organ/external/foot/right))
 
+	// Mutant pieces
+	var/obj/item/organ/internal/ears/mutantears = /obj/item/organ/internal/ears
+
 /datum/species/New()
 	//If the species has eyes, they are the default vision organ
 	if(!vision_organ && has_organ["eyes"])
@@ -165,7 +168,6 @@
 	return species_language.get_random_name(gender)
 
 /datum/species/proc/create_organs(mob/living/carbon/human/H) //Handles creation of mob organs.
-
 	QDEL_LIST(H.internal_organs)
 	QDEL_LIST(H.bodyparts)
 
@@ -184,12 +186,21 @@
 		// organ new code calls `insert` on its own
 		new organ(H)
 
+	create_mutant_organs(H)
+
 	for(var/name in H.bodyparts_by_name)
 		H.bodyparts |= H.bodyparts_by_name[name]
 
 	for(var/obj/item/organ/external/O in H.bodyparts)
 		O.owner = H
 
+/datum/species/proc/create_mutant_organs(mob/living/carbon/human/H)
+	var/obj/item/organ/internal/ears/ears = H.get_int_organ(/obj/item/organ/internal/ears)
+	if(ears)
+		qdel(ears)
+	
+	ears = new mutantears(H)
+
 /datum/species/proc/breathe(mob/living/carbon/human/H)
 	if((NO_BREATHE in species_traits) || (BREATHLESS in H.mutations))
 		return TRUE
@@ -527,7 +538,7 @@
 
 /datum/species/proc/handle_hud_icons_health_side(mob/living/carbon/human/H)
 	if(H.healths)
-		if(H.stat == DEAD)
+		if(H.stat == DEAD || (H.status_flags & FAKEDEATH))
 			H.healths.icon_state = "health7"
 		else
 			switch(H.hal_screwyhud)
@@ -546,7 +557,7 @@
 
 /datum/species/proc/handle_hud_icons_health_doll(mob/living/carbon/human/H)
 	if(H.healthdoll)
-		if(H.stat == DEAD)
+		if(H.stat == DEAD || (H.status_flags & FAKEDEATH))
 			H.healthdoll.icon_state = "healthdoll_DEAD"
 			if(H.healthdoll.overlays.len)
 				H.healthdoll.overlays.Cut()

code/modules/mob/living/carbon/slime/life.dm

@@ -218,15 +218,8 @@
 	if(src.eye_blind)
 		src.SetEyeBlind(0)
 
-	if(src.ear_deaf > 0) SetEarDeaf(0)
-	if(src.ear_damage < 25)
-		SetEarDamage(0)
-
 	src.density = !( src.lying )
 
-	if(src.disabilities & DEAF)
-		EarDeaf(1)
-
 	if(src.eye_blurry > 0)
 		SetEyeBlurry(0)
 

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

@@ -489,4 +489,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	if(istype(toEat, /obj/item/reagent_containers/food/drinks))
 		return 1
 	to_chat(user, "This creature does not seem to have a mouth!")
-	return 0
+	return 0
+
+/mob/living/carbon/slime/can_hear()
+	. = TRUE //honestly fuck slimes and organ bullshit

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

@@ -27,3 +27,9 @@
 			setStaminaLoss(health - 2)
 			handle_hud_icons_health()
 			return
+
+/mob/living/carbon/can_hear()
+	. = FALSE
+	var/obj/item/organ/internal/ears/ears = get_int_organ(/obj/item/organ/internal/ears)
+	if(istype(ears) && !ears.deaf)
+		. = TRUE

code/modules/mob/living/life.dm

@@ -170,15 +170,6 @@
 	else if(eye_blurry)			//blurry eyes heal slowly
 		AdjustEyeBlurry(-1)
 
-	//Ears
-	if(disabilities & DEAF)		//disabled-deaf, doesn't get better on its own
-		EarDeaf(1)
-	else
-		// deafness heals slowly over time, unless ear_damage is over 100
-		if(ear_damage < 100)
-			AdjustEarDamage(-0.05)
-			AdjustEarDeaf(-1)
-
 //this handles hud updates. Calls update_vision() and handle_hud_icons()
 /mob/living/proc/handle_regular_hud_updates()
 	if(!client)	return 0

code/modules/mob/living/living.dm

@@ -404,8 +404,7 @@
 	CureNervous()
 	SetEyeBlind(0)
 	SetEyeBlurry(0)
-	SetEarDamage(0)
-	SetEarDeaf(0)
+	RestoreEars()
 	heal_overall_damage(1000, 1000)
 	ExtinguishMob()
 	fire_stacks = 0

code/modules/mob/living/silicon/ai/ai.dm

@@ -370,7 +370,8 @@ var/list/ai_verbs_default = list(
 		"Fuzzy",
 		"Glitchman",
 		"House",
-		"Database"
+		"Database",
+		"Alien"
 		)
 	if(custom_sprite)
 		display_choices += "Custom"
@@ -451,6 +452,8 @@ var/list/ai_verbs_default = list(
 			icon_state = "ai-house"
 		if("Database")
 			icon_state = "ai-database"
+		if("Alien")
+			icon_state = "ai-alien"
 		else
 			icon_state = "ai"
 	//else

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

@@ -330,9 +330,5 @@
 	return 1
 
 /////////////////////////////////// EAR DAMAGE ////////////////////////////////////
-
-/mob/living/silicon/SetEarDamage()
-	return
-
-/mob/living/silicon/SetEarDeaf()
-	return
+/mob/living/silicon/can_hear()
+	. = TRUE

code/modules/mob/living/simple_animal/friendly/diona.dm

@@ -32,24 +32,72 @@
 	melee_damage_upper = 8
 	attacktext = "bites"
 	attack_sound = 'sound/weapons/bite.ogg'
+	var/chirp_sound = 'sound/misc/nymphchirp.ogg' //used in emote
 
 	speed = 0
 	stop_automated_movement = 0
 	turns_per_move = 4
 
 	var/list/donors = list()
-	var/ready_evolve = 0
 	holder_type = /obj/item/holder/diona
-	can_collar = 1
+	can_collar = TRUE
+
+	a_intent = INTENT_HELP
+	var/gestalt_alert = "merged with gestalt" //used in adding and clearing alert
+	var/evolve_donors = 5 //amount of blood donors needed before evolving
+	var/awareness_donors = 3 //amount of blood donors needed for understand language
+	var/nutrition_need = 500 //amount of nutrition needed before evolving
+
+	var/datum/action/innate/diona/merge/merge_action = new()
+	var/datum/action/innate/diona/evolve/evolve_action = new()
+	var/datum/action/innate/diona/steal_blood/steal_blood_action = new()
+
+/datum/action/innate/diona/merge
+	name = "Merge with gestalt"
+	icon_icon = 'icons/mob/human_races/r_diona.dmi'
+	button_icon_state = "preview"
+
+/datum/action/innate/diona/merge/Activate()
+	var/mob/living/simple_animal/diona/user = owner
+	user.merge()
+	
+/datum/action/innate/diona/evolve
+	name = "Evolve"
+	icon_icon = 'icons/obj/cloning.dmi'
+	button_icon_state = "pod_1"
+
+/datum/action/innate/diona/evolve/Activate()
+	var/mob/living/simple_animal/diona/user = owner
+	user.evolve()
+
+/datum/action/innate/diona/steal_blood
+	name = "Steal blood"
+	icon_icon = 'icons/obj/bloodpack.dmi'
+	button_icon_state = "full"
+
+/datum/action/innate/diona/steal_blood/Activate()
+	var/mob/living/simple_animal/diona/user = owner
+	user.steal_blood()
 
 /mob/living/simple_animal/diona/New()
 	..()
 	if(name == initial(name)) //To stop Pun-Pun becoming generic.
 		name = "[name] ([rand(1, 1000)])"
 		real_name = name
-
 	add_language("Rootspeak")
-	verbs += /mob/living/simple_animal/diona/proc/merge
+	merge_action.Grant(src)
+	evolve_action.Grant(src)
+	steal_blood_action.Grant(src)
+
+/mob/living/simple_animal/diona/UnarmedAttack(var/atom/A)
+	if(isdiona(A) && (src in A.contents)) //can't attack your gestalt
+		visible_message("[src] wiggles around a bit.")
+	else
+		..()
+
+/mob/living/simple_animal/diona/resist()
+	..()
+	split()
 
 /mob/living/simple_animal/diona/attack_hand(mob/living/carbon/human/M)
 	//Let people pick the little buggers up.
@@ -57,88 +105,76 @@
 		if(isdiona(M))
 			to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
 			to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
-			verbs += /mob/living/simple_animal/diona/proc/split
-			verbs -= /mob/living/simple_animal/diona/proc/merge
+			throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist
 			forceMove(M)
 		else
 			get_scooped(M)
 
-	..()
-
 /mob/living/simple_animal/diona/proc/merge()
-	set category = "Diona"
-	set name = "Merge with gestalt"
-	set desc = "Merge with another diona."
-
-	if(iscarbon(loc))
-		verbs -= /mob/living/simple_animal/diona/proc/merge
-		return
+	if(stat != CONSCIOUS)
+		return FALSE
 
 	var/list/choices = list()
-	for(var/mob/living/carbon/C in view(1,src))
-
-		if(!(Adjacent(C)) || !(C.client))
+	for(var/mob/living/carbon/human/H in view(1,src))
+		if(!(Adjacent(H)) || !isdiona(H))
 			continue
+		choices += H
 
-		if(ishuman(C))
-			var/mob/living/carbon/human/D = C
-			if(isdiona(D))
-				choices += C
+	if(!choices.len)
+		to_chat(src, "<span class='warning'>No suitable diona nearby.</span>")
+		return FALSE
 
 	var/mob/living/M = input(src,"Who do you wish to merge with?") in null|choices
 
-	if(!M || !src || !(Adjacent(M)))
-		return
+	if(!M || !src || !(Adjacent(M)) || stat != CONSCIOUS) //input can take a while, so re-validate
+		return FALSE
 
-	if(ishuman(M))
+	if(isdiona(M))
 		to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
 		M.status_flags |= PASSEMOTES
-
 		to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
 		forceMove(M)
-		verbs += /mob/living/simple_animal/diona/proc/split
-		verbs -= /mob/living/simple_animal/diona/proc/merge
+		throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist
+		return TRUE
 	else
-		return
+		return FALSE
 
 /mob/living/simple_animal/diona/proc/split()
-	set category = "Diona"
-	set name = "Split from gestalt"
-	set desc = "Split away from your gestalt as a lone nymph."
-
-	if(!(iscarbon(loc)))
-		verbs -= /mob/living/simple_animal/diona/proc/split
-		return
-
+	if((stat != CONSCIOUS) || !isdiona(loc))
+		return FALSE
+	var/mob/living/carbon/human/D = loc
+	T = get_turf(src)
+	if(!T)
+		return FALSE
 	to_chat(loc, "You feel a pang of loss as [src] splits away from your biomass.")
 	to_chat(src, "You wiggle out of the depths of [loc]'s biomass and plop to the ground.")
+	forceMove(T)
+	
+	var/hasMobs = FALSE
+	for(var/atom/A in D.contents)
+		if(istype(A, /mob/) || istype(A, /obj/item/holder))
+			hasMobs = TRUE
+	if(!hasMobs)
+		D.status_flags &= ~PASSEMOTES
 
-	var/mob/living/M = loc
+	clear_alert(gestalt_alert)
+	return TRUE
 
-	forceMove(get_turf(src))
-	verbs -= /mob/living/simple_animal/diona/proc/split
-	verbs += /mob/living/simple_animal/diona/proc/merge
-
-	if(istype(M))
-		for(var/atom/A in M.contents)
-			if(istype(A, /mob/living/simple_animal/borer) || istype(A, /obj/item/holder))
-				return
-	M.status_flags &= ~PASSEMOTES
-
-/mob/living/simple_animal/diona/verb/evolve()
-	set category = "Diona"
-	set name = "Evolve"
-	set desc = "Grow to a more complex form."
-
-	if(donors.len < 5)
+/mob/living/simple_animal/diona/proc/evolve()
+	if(stat != CONSCIOUS)		
+		return FALSE
+	
+	if(donors.len < evolve_donors)
 		to_chat(src, "<span class='warning'>You need more blood in order to ascend to a new state of consciousness...</span>")
-		return
+		return FALSE
 
-	if(nutrition < 500)
+	if(nutrition < nutrition_need)
 		to_chat(src, "<span class='warning'>You need to binge on weeds in order to have the energy to grow...</span>")
-		return
+		return FALSE
 
-	split()
+	if(isdiona(loc) && !split()) //if it's merged with diona, needs to able to split before evolving
+		return FALSE
+	
 	visible_message("<span class='danger'>[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.</span>","<span class='danger'>You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.</span>")
 
 	var/mob/living/carbon/human/diona/adult = new(get_turf(loc))
@@ -162,28 +198,33 @@
 		unEquip(W)
 
 	qdel(src)
+	return TRUE
 
-/mob/living/simple_animal/diona/verb/steal_blood()
-	set category = "Diona"
-	set name = "Steal Blood"
-	set desc = "Take a blood sample from a suitable donor."
-
+/mob/living/simple_animal/diona/proc/steal_blood() 
+	if(stat != CONSCIOUS)		
+		return FALSE
+	
 	var/list/choices = list()
 	for(var/mob/living/carbon/human/H in oview(1,src))
-		choices += H
+		if(Adjacent(H) && H.dna && !(NO_BLOOD in H.dna.species.species_traits))
+			choices += H		
+
+	if(!choices.len)
+		to_chat(src, "<span class='warning'>No suitable blood donors nearby.</span>")
+		return FALSE
 
 	var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices
 
-	if(!M || !src)
-		return
+	if(!M || !src || !(Adjacent(M)) || stat != CONSCIOUS) //input can take a while, so re-validate
+		return FALSE
 
-	if(NO_BLOOD in M.dna.species.species_traits)
+	if(!M.dna || (NO_BLOOD in M.dna.species.species_traits))
 		to_chat(src, "<span class='warning'>That donor has no blood to take.</span>")
-		return
+		return FALSE
 
 	if(donors.Find(M.real_name))
 		to_chat(src, "<span class='warning'>That donor offers you nothing new.</span>")
-		return
+		return FALSE
 
 	visible_message("<span class='danger'>[src] flicks out a feeler and neatly steals a sample of [M]'s blood.</span>","<span class='danger'>You flick out a feeler and neatly steal a sample of [M]'s blood.</span>")
 	donors += M.real_name
@@ -195,13 +236,12 @@
 		update_progression()
 
 /mob/living/simple_animal/diona/proc/update_progression()
-	if(!donors.len)
-		return
+	if(stat != CONSCIOUS || !donors.len)
+		return FALSE
 
-	if(donors.len == 5)
-		ready_evolve = 1
+	if(donors.len == evolve_donors)
 		to_chat(src, "<span class='noticealien'>You feel ready to move on to your next stage of growth.</span>")
-	else if(donors.len == 3)
+	else if(donors.len == awareness_donors)
 		universal_understand = 1
 		to_chat(src, "<span class='noticealien'>You feel your awareness expand, and realize you know how to understand the creatures around you.</span>")
 	else
@@ -219,7 +259,7 @@
 	return
 
 /mob/living/simple_animal/diona/emote(act, m_type=1, message = null)
-	if(stat)
+	if(stat != CONSCIOUS)
 		return
 
 	var/on_CD = 0
@@ -237,6 +277,6 @@
 		if("chirp")
 			message = "<B>\The [src]</B> chirps!"
 			m_type = 2 //audible
-			playsound(src, 'sound/misc/nymphchirp.ogg', 40, 1, 1)
+			playsound(src, chirp_sound, 40, 1, 1)
 
 	..(act, m_type, message)

code/modules/mob/living/simple_animal/hostile/headcrab.dm

@@ -23,6 +23,11 @@
 	var/datum/mind/origin
 	var/egg_lain = 0
 
+/mob/living/simple_animal/hostile/headcrab/examine(mob/user)
+	..()
+	if(stat == DEAD)
+		to_chat(desc = "It appears to be dead.")
+
 /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
 	var/obj/item/organ/internal/body_egg/changeling_egg/egg = new(victim)
 	egg.insert(victim)

code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm

@@ -101,7 +101,7 @@ Difficulty: Medium
 	animate(src, pixel_z = 0, time = 12)
 
 /obj/effect/temp_visual/target
-	icon = 'icons/mob/actions.dmi'
+	icon = 'icons/mob/actions/actions.dmi'
 	icon_state = "sniper_zoom"
 	layer = MOB_LAYER - 0.1
 	luminosity = 2

code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm

@@ -65,7 +65,7 @@
 
 /datum/action/innate/terrorspider/queen/queensense
 	name = "Hive Sense"
-	icon_icon = 'icons/mob/actions.dmi'
+	icon_icon = 'icons/mob/actions/actions.dmi'
 	button_icon_state = "mindswap"
 
 /datum/action/innate/terrorspider/queen/queensense/Activate()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -578,9 +578,5 @@
 		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
 			return
 
-/mob/living/simple_animal/SetEarDamage()
-	return
-
-/mob/living/simple_animal/SetEarDeaf()
-	return
-
+/mob/living/simple_animal/can_hear()
+	. = TRUE

code/modules/mob/living/status_procs.dm

@@ -43,10 +43,6 @@
 			A trippy overlay appears.
 	*	Drunk						*
 			Essentially what your "BAC" is - the higher it is, the more alcohol you have in you
-	* EarDamage				*
-			Doesn't do much, but if it's 25+, you go deaf. Heals much slower than other statuses - 0.05 normally
-	*	EarDeaf					*
-			You cannot hear. Prevents EarDamage from healing naturally.
 	*	EyeBlind				*
 			You cannot see. Prevents EyeBlurry from healing naturally.
 	*	EyeBlurry				*
@@ -115,8 +111,6 @@
 	var/drowsyness = 0
 	var/druggy = 0
 	var/drunk = 0
-	var/ear_damage = 0
-	var/ear_deaf = 0
 	var/eye_blind = 0
 	var/eye_blurry = 0
 	var/hallucination = 0
@@ -233,30 +227,6 @@
 	var/new_value = directional_bounded_sum(druggy, amount, bound_lower, bound_upper)
 	return SetDruggy(new_value, updating)
 
-// EAR_DAMAGE
-
-/mob/living/EarDamage(amount)
-	SetEarDamage(max(ear_damage, amount))
-
-/mob/living/SetEarDamage(amount)
-	ear_damage = max(amount, 0)
-
-/mob/living/AdjustEarDamage(amount, bound_lower = 0, bound_upper = INFINITY)
-	var/new_value = directional_bounded_sum(ear_damage, amount, bound_lower, bound_upper)
-	SetEarDamage(new_value)
-
-// EAR_DEAF
-
-/mob/living/EarDeaf(amount)
-	SetEarDeaf(max(ear_deaf, amount))
-
-/mob/living/SetEarDeaf(amount)
-	ear_deaf = max(amount, 0)
-
-/mob/living/AdjustEarDeaf(amount, bound_lower = 0, bound_upper = INFINITY)
-	var/new_value = directional_bounded_sum(ear_deaf, amount, bound_lower, bound_upper)
-	SetEarDeaf(new_value)
-
 // EYE_BLIND
 
 /mob/living/EyeBlind(amount, updating = TRUE)

code/modules/mob/living/update_status.dm

@@ -41,7 +41,7 @@
 
 // Whether the mob can hear things
 /mob/living/can_hear()
-	return !(ear_deaf || (disabilities & DEAF))
+	. = !(disabilities & DEAF)
 
 // Whether the mob is able to see
 // `information_only` is for stuff that's purely informational - like understanding nonverbal languages, or blindness overlays
@@ -137,10 +137,6 @@
 			SetEyeBlind(eye_blind)
 		if("eye_blurry")
 			SetEyeBlurry(eye_blurry)
-		if("ear_deaf")
-			SetEarDeaf(ear_deaf)
-		if("ear_damage")
-			SetEarDamage(ear_damage)
 		if("druggy")
 			SetDruggy(druggy)
 		if("maxHealth")

code/modules/mob/new_player/new_player.dm

@@ -1,6 +1,5 @@
 /mob/new_player
 	var/ready = 0
-	var/skip_antag = 0	//For declining an antag roll this round.
 	var/spawning = 0	//Referenced when you want to delete the new_player later on in the code.
 	var/totalPlayers = 0		 //Player counts for the Lobby tab
 	var/totalPlayersReady = 0
@@ -65,16 +64,16 @@
 	if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
 		if(!ready)	output += "<p><a href='byond://?src=[UID()];ready=1'>Declare Ready</A></p>"
 		else	output += "<p><b>You are ready</b> (<a href='byond://?src=[UID()];ready=2'>Cancel</A>)</p>"
-
-		var/list/antags = client.prefs.be_special
-		if(antags && antags.len)
-			if(!skip_antag) output += "<p><a href='byond://?src=[UID()];skip_antag=1'>Global Antag Candidacy</A>"
-			else	output += "<p><a href='byond://?src=[UID()];skip_antag=2'>Global Antag Candidacy</A>"
-			output += "<br /><small>You are <b>[skip_antag ? "ineligible" : "eligible"]</b> for all antag roles.</small></p>"
 	else
 		output += "<p><a href='byond://?src=[UID()];manifest=1'>View the Crew Manifest</A></p>"
 		output += "<p><a href='byond://?src=[UID()];late_join=1'>Join Game!</A></p>"
 
+	var/list/antags = client.prefs.be_special
+	if(antags && antags.len)
+		if(!client.skip_antag) output += "<p><a href='byond://?src=[UID()];skip_antag=1'>Global Antag Candidacy</A>"
+		else	output += "<p><a href='byond://?src=[UID()];skip_antag=2'>Global Antag Candidacy</A>"
+		output += "<br /><small>You are <b>[client.skip_antag ? "ineligible" : "eligible"]</b> for all antag roles.</small></p>"
+
 	output += "<p><a href='byond://?src=[UID()];observe=1'>Observe</A></p>"
 
 	if(GLOB.join_tos)
@@ -172,7 +171,7 @@
 		new_player_panel_proc()
 
 	if(href_list["skip_antag"])
-		skip_antag = !skip_antag
+		client.skip_antag = !client.skip_antag
 		new_player_panel_proc()
 
 	if(href_list["refresh"])

code/modules/mob/new_player/sprite_accessories/diona/diona_hair.dm

@@ -0,0 +1,59 @@
+
+//DIONA: Sprites by skittles below
+/datum/sprite_accessory/hair/diona
+    icon = 'icons/mob/sprite_accessories/diona/diona_hair.dmi'
+    species_allowed = list("Diona")
+    glasses_over = 1
+    do_colouration = 0
+
+/datum/sprite_accessory/hair/diona/diona_bracket
+	name = "Bracket"
+	icon_state = "bracket"
+
+/datum/sprite_accessory/hair/diona/diona_brush
+	name = "Brush"
+	icon_state = "brush"
+
+/datum/sprite_accessory/hair/diona/diona_cornflow
+	name = "Corn Flowers"
+	icon_state = "cornflower"
+
+/datum/sprite_accessory/hair/diona/diona_laur
+	name = "Laural"
+	icon_state = "laurel"
+
+/datum/sprite_accessory/hair/diona/diona_leaf
+	name = "Leafy"
+	icon_state = "leafy"
+
+/datum/sprite_accessory/hair/diona/diona_mead
+	name = "Meadow"
+	icon_state = "meadow"
+
+/datum/sprite_accessory/hair/diona/diona_oak
+	name = "Oak"
+	icon_state = "oak"
+
+/datum/sprite_accessory/hair/diona/diona_root
+	name = "Roots"
+	icon_state = "root"
+
+/datum/sprite_accessory/hair/diona/diona_rose
+	name = "Rose"
+	icon_state = "rosey"
+
+/datum/sprite_accessory/hair/diona/diona_spinner
+	name = "Spinners"
+	icon_state = "spinner"
+
+/datum/sprite_accessory/hair/diona/diona_spout
+	name = "Sprouts"
+	icon_state = "sprout"
+
+/datum/sprite_accessory/hair/diona/diona_vine
+	name = "Vines"
+	icon_state = "vine"
+
+/datum/sprite_accessory/hair/diona/diona_wildflow
+	name = "Wildflowers"
+	icon_state = "wildflower"

code/modules/mob/new_player/sprite_accessories/drask/drask_body_markings.dm

@@ -0,0 +1,7 @@
+/datum/sprite_accessory/body_markings/drask
+    species_allowed = list("Drask")
+
+/datum/sprite_accessory/body_markings/drask/arm_spines_drask
+    icon = 'icons/mob/sprite_accessories/drask/drask_body_markings.dmi'
+    name = "Drask Arm Spines"
+    icon_state = "armspines"

code/modules/mob/new_player/sprite_accessories/grey/grey_body_markings.dm

@@ -0,0 +1,19 @@
+/datum/sprite_accessory/body_markings/tattoo/grey
+    icon = 'icons/mob/sprite_accessories/grey/grey_body_markings.dmi'
+    species_allowed = list("Grey")
+
+/datum/sprite_accessory/body_markings/tattoo/grey/heart_grey
+	name = "Grey Heart Tattoo"
+	icon_state = "heart"
+
+/datum/sprite_accessory/body_markings/tattoo/grey/hive_grey
+	name = "Grey Hive Tattoo"
+	icon_state = "hive"
+
+/datum/sprite_accessory/body_markings/tattoo/grey/nightling_grey
+	name = "Grey Nightling Tattoo"
+	icon_state = "nightling"
+
+/datum/sprite_accessory/body_markings/tattoo/grey/tiger_body_grey
+	name = "Grey Tiger-stripe Tattoo"
+	icon_state = "tiger"

code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm

@@ -0,0 +1,35 @@
+/datum/sprite_accessory/body_markings/none
+	name = "None"
+	species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Skrell", "Slime People", "Skeleton", "Vox", "Kidan")
+	icon_state = "none"
+
+/datum/sprite_accessory/body_markings/tiger
+	name = "Tiger Body"
+	species_allowed = list("Unathi", "Tajaran", "Vulpkanin")
+	icon_state = "tiger"
+
+/datum/sprite_accessory/body_markings/tattoo // Tattoos applied post-round startup with tattoo guns in item_defines.dm
+	species_allowed = list("Human", "Unathi", "Vulpkanin", "Tajaran", "Skrell")
+	icon_state = "none"
+
+/datum/sprite_accessory/body_markings/tattoo/elliot
+	name = "Elliot Circuit Tattoo"
+	icon_state = "campbell"
+	species_allowed = null
+
+/datum/sprite_accessory/body_markings/tattoo/tiger_body // Yep, this is repeated. To be fixed later
+	name = "Tiger-stripe Tattoo"
+	species_allowed = list("Human", "Unathi", "Vulpkanin", "Tajaran", "Skrell")
+	icon_state = "tiger"
+
+/datum/sprite_accessory/body_markings/tattoo/heart
+	name = "Heart Tattoo"
+	icon_state = "heart"
+
+/datum/sprite_accessory/body_markings/tattoo/hive
+	name = "Hive Tattoo"
+	icon_state = "hive"
+
+/datum/sprite_accessory/body_markings/tattoo/nightling
+	name = "Nightling Tattoo"
+	icon_state = "nightling"

code/modules/mob/new_player/sprite_accessories/human/human_facial_hair.dm

@@ -0,0 +1,105 @@
+/*
+///////////////////////////////////
+/  =---------------------------=  /
+/  == Facial Hair Definitions ==  /
+/  =---------------------------=  /
+///////////////////////////////////
+*/
+
+/datum/sprite_accessory/facial_hair/shaved
+    icon = 'icons/mob/human_face.dmi' // Special case, use the bald icon in human face
+    name = "Shaved"
+    icon_state = "bald"
+    gender = NEUTER
+    species_allowed = list("Human", "Unathi", "Tajaran", "Skrell", "Vox", "Diona", "Kidan", "Greys", "Vulpkanin", "Slime People")
+
+/datum/sprite_accessory/facial_hair/watson
+	name = "Watson Mustache"
+	icon_state = "watson"
+
+/datum/sprite_accessory/facial_hair/hogan
+	name = "Hulk Hogan Mustache"
+	icon_state = "hogan" //-Neek
+
+/datum/sprite_accessory/facial_hair/vandyke
+	name = "Van Dyke Mustache"
+	icon_state = "vandyke"
+
+/datum/sprite_accessory/facial_hair/chaplin
+	name = "Square Mustache"
+	icon_state = "chaplin"
+
+/datum/sprite_accessory/facial_hair/selleck
+	name = "Selleck Mustache"
+	icon_state = "selleck"
+
+/datum/sprite_accessory/facial_hair/neckbeard
+	name = "Neckbeard"
+	icon_state = "neckbeard"
+
+/datum/sprite_accessory/facial_hair/fullbeard
+	name = "Full Beard"
+	icon_state = "fullbeard"
+
+/datum/sprite_accessory/facial_hair/longbeard
+	name = "Long Beard"
+	icon_state = "longbeard"
+
+/datum/sprite_accessory/facial_hair/vlongbeard
+	name = "Very Long Beard"
+	icon_state = "wise"
+
+/datum/sprite_accessory/facial_hair/elvis
+	name = "Elvis Sideburns"
+	icon_state = "elvis"
+	species_allowed = list("Human", "Slime People", "Unathi")
+
+/datum/sprite_accessory/facial_hair/abe
+	name = "Abraham Lincoln Beard"
+	icon_state = "abe"
+
+/datum/sprite_accessory/facial_hair/chinstrap
+	name = "Chinstrap"
+	icon_state = "chim"
+
+/datum/sprite_accessory/facial_hair/hip
+	name = "Hipster Beard"
+	icon_state = "hip"
+
+/datum/sprite_accessory/facial_hair/gt
+	name = "Goatee"
+	icon_state = "gt"
+
+/datum/sprite_accessory/facial_hair/jensen
+	name = "Adam Jensen Beard"
+	icon_state = "jensen"
+
+/datum/sprite_accessory/facial_hair/dwarf
+	name = "Dwarf Beard"
+	icon_state = "dwarf"
+
+//////////////////////////////
+//////START VG HAIRSTYLES/////
+//////////////////////////////
+/datum/sprite_accessory/facial_hair/britstache
+	name = "Brit Stache"
+	icon_state = "britstache"
+
+/datum/sprite_accessory/facial_hair/martialartist
+	name = "Martial Artist"
+	icon_state = "martialartist"
+
+/datum/sprite_accessory/facial_hair/moonshiner
+	name = "Moonshiner"
+	icon_state = "moonshiner"
+
+/datum/sprite_accessory/facial_hair/tribeard
+	name = "Tri-beard"
+	icon_state = "tribeard"
+
+/datum/sprite_accessory/facial_hair/unshaven
+	name = "Unshaven"
+	icon_state = "unshaven"
+//////////////////////////////
+//////END VG HAIRSTYLES///////
+//////////////////////////////

code/modules/mob/new_player/sprite_accessories/human/human_hair.dm

@@ -0,0 +1,685 @@
+/*
+== Human Hair Definitions ==
+*/
+
+/datum/sprite_accessory/hair/short
+	name = "Short Hair"	  // try to capatilize the names please~
+	icon_state = "short" // you do not need to define _s or _l sub-states, game automatically does this for you a 
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/cut
+	name = "Cut Hair"
+	icon_state = "cut"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/long
+	name = "Shoulder-length Hair"
+	icon_state = "long"
+
+/datum/sprite_accessory/hair/longalt
+	name = "Shoulder-length Hair Alt"
+	icon_state = "longfringe"
+
+/datum/sprite_accessory/hair/longer
+	name = "Long Hair"
+	icon_state = "vlong"
+
+/datum/sprite_accessory/hair/longeralt
+	name = "Long Hair Alt"
+	icon_state = "vlongfringe"
+
+/datum/sprite_accessory/hair/longest
+	name = "Very Long Hair"
+	icon_state = "longest"
+
+/datum/sprite_accessory/hair/longfringe
+	name = "Long Fringe"
+	icon_state = "longfringe"
+
+/datum/sprite_accessory/hair/longestalt
+	name = "Longer Fringe"
+	icon_state = "vlongfringe"
+
+/datum/sprite_accessory/hair/halfbang
+	name = "Half-banged Hair"
+	icon_state = "halfbang"
+
+/datum/sprite_accessory/hair/halfbangalt
+	name = "Half-banged Hair Alt"
+	icon_state = "halfbang_alt"
+
+/datum/sprite_accessory/hair/ponytail1
+	name = "Ponytail male"
+	icon_state = "ponytailm"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/ponytail2
+	name = "Ponytail female"
+	icon_state = "ponytailf"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/ponytail3
+	name = "Ponytail alt"
+	icon_state = "ponytail3"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/sideponytail
+	name = "Side Ponytail"
+	icon_state = "stail"
+	gender = FEMALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/highponytail
+	name = "High Ponytail"
+	icon_state = "highponytail"
+	gender = FEMALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/wisp
+	name = "Wisp"
+	icon_state = "wisp"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/parted
+	name = "Parted"
+	icon_state = "parted"
+
+/datum/sprite_accessory/hair/pompadour
+	name = "Pompadour"
+	icon_state = "pompadour"
+	gender = MALE
+	species_allowed = list("Human", "Slime People", "Unathi")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/quiff
+	name = "Quiff"
+	icon_state = "quiff"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/bedhead
+	name = "Bedhead"
+	icon_state = "bedhead"
+
+/datum/sprite_accessory/hair/bedhead2
+	name = "Bedhead 2"
+	icon_state = "bedhead2"
+
+/datum/sprite_accessory/hair/bedhead3
+	name = "Bedhead 3"
+	icon_state = "bedhead3"
+
+/datum/sprite_accessory/hair/beehive
+	name = "Beehive"
+	icon_state = "beehive"
+	gender = FEMALE
+	species_allowed = list("Human", "Slime People", "Unathi")
+
+/datum/sprite_accessory/hair/bobcurl
+	name = "Bobcurl"
+	icon_state = "bobcurl"
+	gender = FEMALE
+	species_allowed = list("Human", "Slime People", "Unathi")
+
+/datum/sprite_accessory/hair/bob
+	name = "Bob"
+	icon_state = "bobcut"
+	gender = FEMALE
+	species_allowed = list("Human", "Slime People", "Unathi")
+
+/datum/sprite_accessory/hair/bowl
+	name = "Bowl"
+	icon_state = "bowlcut"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/braid2
+	name = "Long Braid"
+	icon_state = "hbraid"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/braid_hip
+	name = "Hippie Braid"
+	icon_state = "hipbraid"
+	secondary_theme = "beads"
+
+/datum/sprite_accessory/hair/buzz
+	name = "Buzzcut"
+	icon_state = "buzzcut"
+	gender = MALE
+	species_allowed = list("Human", "Slime People", "Unathi")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/crew
+	name = "Crewcut"
+	icon_state = "crewcut"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/combover
+	name = "Combover"
+	icon_state = "combover"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/devillock
+	name = "Devil Lock"
+	icon_state = "devilock"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/dreadlocks
+	name = "Dreadlocks"
+	icon_state = "dreads"
+
+/datum/sprite_accessory/hair/curls
+	name = "Curls"
+	icon_state = "curls"
+
+/datum/sprite_accessory/hair/afro
+	name = "Afro"
+	icon_state = "afro"
+
+/datum/sprite_accessory/hair/afro2
+	name = "Afro 2"
+	icon_state = "afro2"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/afro_large
+	name = "Big Afro"
+	icon_state = "bigafro"
+	gender = MALE
+
+/datum/sprite_accessory/hair/sergeant
+	name = "Flat Top"
+	icon_state = "sergeant"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/emo
+	name = "Emo"
+	icon_state = "emo"
+
+/datum/sprite_accessory/hair/fag
+	name = "Flow Hair"
+	icon_state = "flow"
+
+/datum/sprite_accessory/hair/feather
+	name = "Feather"
+	icon_state = "feather"
+
+/datum/sprite_accessory/hair/hitop
+	name = "Hitop"
+	icon_state = "hitop"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/mohawk
+	name = "Mohawk"
+	icon_state = "mohawk"
+	species_allowed = list("Human", "Slime People", "Unathi")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/jensen
+	name = "Adam Jensen Hair"
+	icon_state = "jensen"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/cia
+	name = "CIA"
+	icon_state = "cia"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/mulder
+	name = "Mulder"
+	icon_state = "mulder"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/gelled
+	name = "Gelled Back"
+	icon_state = "gelled"
+	gender = FEMALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/gentle
+	name = "Gentle"
+	icon_state = "gentle"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/spiky
+	name = "Spiky"
+	icon_state = "spikey"
+	species_allowed = list("Human", "Slime People", "Unathi")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/kusanagi
+	name = "Kusanagi Hair"
+	icon_state = "kusanagi"
+
+/datum/sprite_accessory/hair/kagami
+	name = "Pigtails"
+	icon_state = "kagami"
+	gender = FEMALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/himecut
+	name = "Hime Cut"
+	icon_state = "himecut"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/braid
+	name = "Floorlength Braid"
+	icon_state = "floorbraid"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/odango
+	name = "Odango"
+	icon_state = "odango"
+	gender = FEMALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/ombre
+	name = "Ombre"
+	icon_state = "ombre"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/updo
+	name = "Updo"
+	icon_state = "updo"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/skinhead
+	name = "Skinhead"
+	icon_state = "skinhead"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/balding
+	name = "Balding Hair"
+	icon_state = "balding"
+	gender = MALE // turnoff!
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/longemo
+	name = "Long Emo"
+	icon_state = "emolong"
+	gender = FEMALE
+
+//////////////////////////////
+//////START VG HAIRSTYLES/////
+//////////////////////////////
+/datum/sprite_accessory/hair/birdnest
+	name = "Bird Nest"
+	icon_state = "birdnest"
+
+/datum/sprite_accessory/hair/unkept
+	name = "Unkempt"
+	icon_state = "unkept"
+
+/datum/sprite_accessory/hair/duelist
+	name = "Duelist"
+	icon_state = "duelist"
+	gender = MALE
+
+/datum/sprite_accessory/hair/modern
+	name = "Modern"
+	icon_state = "modern"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/unshavenmohawk
+	name = "Unshaven Mohawk"
+	icon_state = "unshavenmohawk"
+	gender = MALE
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/drills
+	name = "Twincurls"
+	icon_state = "twincurl"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/minidrills
+	name = "Twincurls 2"
+	icon_state = "twincurl2"
+	gender = FEMALE
+//////////////////////////////
+//////END VG HAIRSTYLES///////
+//////////////////////////////
+
+///////////////////////////////////
+//////START POLARIS HAIRSTYLES/////
+//////////////////////////////////
+
+/datum/sprite_accessory/hair/dave
+	name = "Dave"
+	icon_state = "dave"
+
+/datum/sprite_accessory/hair/rosa
+	name = "Rosa"
+	icon_state = "rosa"
+
+/datum/sprite_accessory/hair/jade
+	name = "Jade"
+	icon_state = "jade"
+
+/datum/sprite_accessory/hair/shy
+	name = "Shy"
+	icon_state = "shy"
+
+/datum/sprite_accessory/hair/manbun
+	name = "Manbun"
+	icon_state = "manbun"
+
+/datum/sprite_accessory/hair/thinningback
+	name = "Thinning Back"
+	icon_state = "thinningrear"
+
+/datum/sprite_accessory/hair/thinningfront
+	name = "Thinning Front"
+	icon_state = "thinningfront"
+
+/datum/sprite_accessory/hair/thinning
+	name = "Thinning"
+	icon_state = "thinning"
+
+/datum/sprite_accessory/hair/bowlcut2
+	name = "Bowl 2"
+	icon_state = "bowlcut2"
+
+/datum/sprite_accessory/hair/ronin
+	name = "Ronin"
+	icon_state = "ronin"
+
+/datum/sprite_accessory/hair/topknot
+	name = "Topknot"
+	icon_state = "topknot"
+
+/datum/sprite_accessory/hair/regulationmohawk
+	name = "Regulation Mohawk"
+	icon_state = "shavedmohawk"
+
+/datum/sprite_accessory/hair/rowbraid
+	name = "Row Braid"
+	icon_state = "rowbraid"
+
+/datum/sprite_accessory/hair/rowdualbraid
+	name = "Row Dual Braid"
+	icon_state = "rowdualtail"
+
+/datum/sprite_accessory/hair/rowbun
+	name = "Row Bun"
+	icon_state = "rowbun"
+
+/datum/sprite_accessory/hair/hightight
+	name = "High and Tight"
+	icon_state = "hightight"
+
+/datum/sprite_accessory/hair/partfade
+	name = "Parted Fade"
+	icon_state = "shavedpart"
+	gender = MALE
+
+/datum/sprite_accessory/hair/undercut3
+	name = "Undercut Swept Left"
+	icon_state = "undercut3"
+	gender = MALE
+
+/datum/sprite_accessory/hair/undercut2
+	name = "Undercut Swept Right"
+	icon_state = "undercut2"
+	gender = MALE
+
+/datum/sprite_accessory/hair/undercut1
+	name = "Undercut"
+	icon_state = "undercut1"
+	gender = MALE
+
+/datum/sprite_accessory/hair/coffeehouse
+	name = "Coffee House Cut"
+	icon_state = "coffeehouse"
+	gender = MALE
+
+/datum/sprite_accessory/hair/tightbun
+	name = "Tight Bun"
+	icon_state = "tightbun"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/trimmed
+	name = "Trimmed"
+	icon_state = "trimmed"
+	gender = MALE
+
+/datum/sprite_accessory/hair/trimflat
+	name = "Trimmed Flat Top"
+	icon_state = "trimflat"
+	gender = MALE
+
+/datum/sprite_accessory/hair/nofade
+	name = "Regulation Cut"
+	icon_state = "nofade"
+	gender = MALE
+
+/datum/sprite_accessory/hair/baldfade
+	name = "Balding Fade"
+	icon_state = "baldfade"
+	gender = MALE
+
+/datum/sprite_accessory/hair/highfade
+	name = "High Fade"
+	icon_state = "highfade"
+	gender = MALE
+
+/datum/sprite_accessory/hair/medfade
+	name = "Medium Fade"
+	icon_state = "medfade"
+
+/datum/sprite_accessory/hair/lowfade
+	name = "Low Fade"
+	icon_state = "lowfade"
+	gender = MALE
+
+/datum/sprite_accessory/hair/oxton
+	name = "Oxton"
+	icon_state = "oxton"
+
+/datum/sprite_accessory/hair/doublebun
+	name = "Double-Bun"
+	icon_state = "doublebun"
+
+/datum/sprite_accessory/hair/halfshaved
+	name = "Half-Shaved Emo"
+	icon_state = "halfshaved"
+
+/datum/sprite_accessory/hair/shortbangs
+	name = "Short Bangs"
+	icon_state = "shortbangs"
+
+/datum/sprite_accessory/hair/longeralt2
+	name = "Long Hair Alt 2"
+	icon_state = "longeralt2"
+
+/datum/sprite_accessory/hair/nia
+	name = "Nia"
+	icon_state = "nia"
+
+/datum/sprite_accessory/hair/eighties
+	name = "80's"
+	icon_state = "80s"
+
+/datum/sprite_accessory/hair/volaju
+	name = "Volaju"
+	icon_state = "volaju"
+
+/datum/sprite_accessory/hair/joestar
+	name = "Joestar"
+	icon_state = "joestar"
+	gender = MALE
+
+/datum/sprite_accessory/hair/nitori
+	name = "Nitori"
+	icon_state = "nitori"
+
+/datum/sprite_accessory/hair/scully
+	name = "Scully"
+	icon_state = "scully"
+
+/datum/sprite_accessory/hair/vegeta
+	name = "Vegeta"
+	icon_state = "toriyama2"
+
+/datum/sprite_accessory/hair/crono
+	name = "Chrono"
+	icon_state = "toriyama"
+
+/datum/sprite_accessory/hair/poofy2
+	name = "Poofy2"
+	icon_state = "poofy2"
+
+/datum/sprite_accessory/hair/poofy
+	name = "Poofy"
+	icon_state = "poofy"
+
+/datum/sprite_accessory/hair/dandypomp
+	name = "Dandy Pompadour"
+	icon_state = "dandypompadour"
+
+/datum/sprite_accessory/hair/fringetail
+	name = "Fringetail"
+	icon_state = "fringetail"
+
+/datum/sprite_accessory/hair/mahdrills
+	name = "Drillruru"
+	icon_state = "drillruru"
+
+/datum/sprite_accessory/hair/familyman
+	name = "The Family Man"
+	icon_state = "thefamilyman"
+
+/datum/sprite_accessory/hair/grandebraid
+	name = "Grande Braid"
+	icon_state = "grande"
+
+/datum/sprite_accessory/hair/fringeemo
+	name = "Emo Fringe"
+	icon_state = "emofringe"
+
+/datum/sprite_accessory/hair/emo2
+	name = "Emo Alt"
+	icon_state = "emo2"
+
+/datum/sprite_accessory/hair/sargeant // TODO: Remove this typepath due to redundancy - Ansari
+	name = "Flat Top"
+	icon_state = "sergeant"
+
+/datum/sprite_accessory/hair/rows2
+	name = "Rows 2"
+	icon_state = "rows2"
+
+/datum/sprite_accessory/hair/rows
+	name = "Rows"
+	icon_state = "rows1"
+
+/datum/sprite_accessory/hair/reversemohawk
+	name = "Reverse Mohawk"
+	icon_state = "reversemohawk"
+
+/datum/sprite_accessory/hair/father
+	name = "Father"
+	icon_state = "father"
+
+/datum/sprite_accessory/hair/beehive2
+	name = "Beehive 2"
+	icon_state = "beehive2"
+
+/datum/sprite_accessory/hair/sleeze
+	name = "Sleeze"
+	icon_state = "sleeze"
+
+/datum/sprite_accessory/hair/zieglertail
+	name = "Zieglertail"
+	icon_state = "ziegler"
+
+/datum/sprite_accessory/hair/spikyponytail
+	name = "Spiky Ponytail"
+	icon_state = "spikyponytail"
+
+/datum/sprite_accessory/hair/tresshoulder
+	name = "Tress Shoulder"
+	icon_state = "tressshoulder"
+
+/datum/sprite_accessory/hair/oneshoulder
+	name = "One Shoulder"
+	icon_state = "oneshoulder"
+
+/datum/sprite_accessory/hair/ponytail6
+	name = "Ponytail 6"
+	icon_state = "ponytail6"
+
+/datum/sprite_accessory/hair/ponytail5
+	name = "Ponytail 5"
+	icon_state = "ponytail5"
+
+/datum/sprite_accessory/hair/ponytail4
+	name = "Ponytail 4"
+	icon_state = "ponytail4"
+
+/datum/sprite_accessory/hair/country
+	name = "Country"
+	icon_state = "country"
+
+/datum/sprite_accessory/hair/bedheadlong
+	name = "Bedhead Long"
+	icon_state = "long_bedhead"
+
+/datum/sprite_accessory/hair/flair
+	name = "Flaired Hair"
+	icon_state = "flair"
+
+/datum/sprite_accessory/hair/twintail
+	name = "Twintail"
+	icon_state = "twintail"
+
+/datum/sprite_accessory/hair/short2
+	name = "Short Hair 2"
+	icon_state = "shorthair3"
+
+/datum/sprite_accessory/hair/bun2
+	name = "Bun 2"
+	icon_state = "bun2"
+
+/datum/sprite_accessory/hair/bun3
+	name = "Bun 3"
+	icon_state = "bun3"
+
+/datum/sprite_accessory/hair/shavehair
+	name = "Shaved Hair"
+	icon_state = "shaved"
+
+/datum/sprite_accessory/hair/veryshortovereyealternate
+	name = "Overeye Very Short, Alternate"
+	icon_state = "veryshortovereyealternate"
+
+/datum/sprite_accessory/hair/veryshortovereye
+	name = "Overeye Very Short"
+	icon_state = "veryshortovereye"
+
+/datum/sprite_accessory/hair/shortovereye
+	name = "Overeye Short"
+	icon_state = "shortovereye"
+
+/datum/sprite_accessory/hair/longovereye
+	name = "Overeye Long"
+	icon_state = "longovereye"
+
+/datum/sprite_accessory/hair/father
+	name = "Father"
+	icon_state = "father"
+
+/datum/sprite_accessory/hair/bun4 // Due to a vulp hairstyle called bun
+	name = "Bun 4"
+	icon_state = "bun4"
+
+///////////////////////////////////
+//////END POLARIS HAIRSTYLES///////
+//////////////////////////////////

code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm

@@ -0,0 +1,135 @@
+/datum/sprite_accessory/hair/ipc
+	icon = 'icons/mob/sprite_accessories/ipc/ipc_face.dmi'
+	species_allowed = list("Machine")
+	glasses_over = 1
+	models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.", "Shellguard Munitions Monitor Series")
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_pink
+	name = "Pink IPC Screen"
+	icon_state = "pink"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_red
+	name = "Red IPC Screen"
+	icon_state = "red"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_green
+	name = "Green IPC Screen"
+	icon_state = "green"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_blue
+	name = "Blue IPC Screen"
+	icon_state = "blue"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_breakout
+	name = "Breakout IPC Screen"
+	icon_state = "breakout"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_eight
+	name = "Eight IPC Screen"
+	icon_state = "eight"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_rainbow
+	name = "Rainbow IPC Screen"
+	icon_state = "rainbow"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_goggles
+	name = "Goggles IPC Screen"
+	icon_state = "goggles"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_heart
+	name = "Heart IPC Screen"
+	icon_state = "heart"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_monoeye
+	name = "Monoeye IPC Screen"
+	icon_state = "monoeye"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_nature
+	name = "Nature IPC Screen"
+	icon_state = "nature"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_orange
+	name = "Orange IPC Screen"
+	icon_state = "orange"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_purple
+	name = "Purple IPC Screen"
+	icon_state = "purple"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_shower
+	name = "Shower IPC Screen"
+	icon_state = "shower"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_static
+	name = "Static IPC Screen"
+	icon_state = "static"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_yellow
+	name = "Yellow IPC Screen"
+	icon_state = "yellow"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_scrolling
+	name = "Scanline IPC Screen"
+	icon_state = "scroll"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_console
+	name = "Console IPC Screen"
+	icon_state = "console"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_rgb
+	name = "RGB IPC Screen"
+	icon_state = "rgb"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_glider
+	name = "Glider IPC Screen"
+	icon_state = "gol_glider"
+
+/datum/sprite_accessory/hair/ipc/hesphiastos_alt_off
+	name = "Dark Hesphiastos Screen"
+	icon_state = "off"
+	models_allowed = list("Hesphiastos Industries alt.")
+
+/datum/sprite_accessory/hair/ipc/hesphiastos_alt_pink
+	name = "Pink Hesphiastos Screen"
+	icon_state = "pink_hesp_alt"
+	models_allowed = list("Hesphiastos Industries alt.")
+
+/datum/sprite_accessory/hair/ipc/hesphiastos_alt_orange
+	name = "Orange Hesphiastos Screen"
+	icon_state = "orange_hesp_alt"
+	models_allowed = list("Hesphiastos Industries alt.")
+
+/datum/sprite_accessory/hair/ipc/hesphiastos_alt_goggle
+	name = "Goggles Hesphiastos Screen"
+	icon_state = "goggles_hesp_alt"
+	models_allowed = list("Hesphiastos Industries alt.")
+
+/datum/sprite_accessory/hair/ipc/hesphiastos_alt_scroll
+	name = "Scrolling Hesphiastos Screen"
+	icon_state = "scroll_hesp_alt"
+	models_allowed = list("Hesphiastos Industries alt.")
+
+/datum/sprite_accessory/hair/ipc/hesphiastos_alt_rgb
+	name = "RGB Hesphiastos Screen"
+	icon_state = "rgb_hesp_alt"
+	models_allowed = list("Hesphiastos Industries alt.")
+
+/datum/sprite_accessory/hair/ipc/hesphiastos_alt_rainbow
+	name = "Rainbow Hesphiastos Screen"
+	icon_state = "rainbow_hesp_alt"
+	models_allowed = list("Hesphiastos Industries alt.")
+
+/datum/sprite_accessory/hair/ipc/fluff
+	fluff = 1
+
+/datum/sprite_accessory/hair/ipc/fluff/lumi_face //Lumi Fluff hair
+	name = "Lumi Face"
+	icon_state = "lumi_face"
+
+/datum/sprite_accessory/hair/ipc/fluff/lumi_blush //Lumi Fluff hair
+	name = "Lumi Blush"
+	icon_state = "lumi_blush"
+
+/datum/sprite_accessory/hair/ipc/fluff/lumi_waiting //Lumi Fluff hair
+	name = "Lumi Waiting"
+	icon_state = "lumi_waiting"

code/modules/mob/new_player/sprite_accessories/ipc/ipc_head_accessories.dm

@@ -0,0 +1,41 @@
+
+/datum/sprite_accessory/head_accessory/ipc
+    icon = 'icons/mob/sprite_accessories/ipc/ipc_head_accessories.dmi'
+    species_allowed = list("Machine")
+    over_hair = 1
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_antennae
+	name = "Antennae"
+	icon_state = "antennae"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_tv_antennae
+	name = "T.V. Antennae"
+	icon_state = "tvantennae"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_tesla_antennae
+	name = "Tesla Antennae"
+	icon_state = "tesla"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_light
+	name = "Head Light"
+	icon_state = "light"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_lights
+	name = "Side Lights"
+	icon_state = "sidelights"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_cyber_head
+	name = "Cyber Pipes"
+	icon_state = "cyberhead"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_antlers
+	name = "Antlers"
+	icon_state = "antlers"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_drone_eyes
+	name = "Drone Eyes"
+	icon_state = "droneeyes"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_crowned
+	name = "Crowned"
+	icon_state = "crowned"

code/modules/mob/new_player/sprite_accessories/ipc/ipc_optics.dm

@@ -0,0 +1,26 @@
+/datum/sprite_accessory/body_markings/head/optics
+    icon = 'icons/mob/sprite_accessories/ipc/ipc_optics.dmi'
+    name = "Humanoid Optics"
+    species_allowed = list("Machine")
+    icon_state = "optics"
+    models_allowed = list("Bishop Cybernetics", "Hesphiastos Industries", "Ward-Takahashi", "Xion Manufacturing Group", "Zeng-Hu Pharmaceuticals") //Should be the same as the manufacturing company of the limb in robolimbs.dm
+
+/datum/sprite_accessory/body_markings/head/optics/bishop_alt
+	name = "Bishop Alt. Optics"
+	icon_state = "bishop_alt_optics"
+	models_allowed = list("Bishop Cybernetics alt.")
+
+/datum/sprite_accessory/body_markings/head/optics/morpheus_alt
+	name = "Morpheus Alt. Optics"
+	icon_state = "morpheus_alt_optics"
+	models_allowed = list("Morpheus Cyberkinetics alt.")
+
+/datum/sprite_accessory/body_markings/head/optics/wardtakahashi_alt
+	name = "Ward-Takahashi Alt. Optics"
+	icon_state = "wardtakahashi_alt_optics"
+	models_allowed = list("Ward-Takahashi alt.")
+
+/datum/sprite_accessory/body_markings/head/optics/xion_alt
+	name = "Xion Alt. Optics"
+	icon_state = "xion_alt_optics"
+	models_allowed = list("Xion Manufacturing Group alt.")

code/modules/mob/new_player/sprite_accessories/kidan/kidan_body_markings.dm

@@ -0,0 +1,7 @@
+/datum/sprite_accessory/body_markings/kidan
+    icon = 'icons/mob/sprite_accessories/kidan/kidan_body_markings.dmi'
+    species_allowed = list("Kidan")
+
+/datum/sprite_accessory/body_markings/kidan/outline_kid
+	name = "Kidan Outline"
+	icon_state = "outline"

code/modules/mob/new_player/sprite_accessories/kidan/kidan_hair.dm

@@ -0,0 +1,34 @@
+//Kidan Hairstyles with sprites by Travelling Merchant
+/datum/sprite_accessory/hair/kidan
+	icon = 'icons/mob/sprite_accessories/kidan/kidan_hair.dmi'
+	species_allowed = list("Kidan")
+	glasses_over = 1
+	do_colouration = 0
+
+/datum/sprite_accessory/hair/kidan/hollow_horns
+	name = "Hollow Horns"
+	icon_state = "hollow_horns"
+
+/datum/sprite_accessory/hair/kidan/wide_horns
+	name = "Wide Horns"
+	icon_state = "wide_horns"
+
+/datum/sprite_accessory/hair/kidan/curled_horns
+	name = "Curled Horns"
+	icon_state = "curled_horns"
+
+/datum/sprite_accessory/hair/kidan/hawk_horn
+	name = "Hawk Horn"
+	icon_state = "hawk_horn"
+
+/datum/sprite_accessory/hair/kidan/kidan_bull_horns
+	name = "Bull Horns"
+	icon_state = "bull_horns"
+
+/datum/sprite_accessory/hair/kidan/kidan_broken_bull_horns
+	name = "Broken Bull Horns"
+	icon_state = "broken_bull_horns"
+
+/datum/sprite_accessory/hair/kidan/kidan_tall_horns
+	name = "Tall Horns"
+	icon_state = "tall_horns"

code/modules/mob/new_player/sprite_accessories/kidan/kidan_head_accessories.dm

@@ -0,0 +1,56 @@
+/datum/sprite_accessory/head_accessory/kidan
+	icon = 'icons/mob/sprite_accessories/kidan/kidan_head_accessories.dmi'
+	species_allowed = list("Kidan")
+	over_hair = 1
+	do_colouration = 1
+
+/datum/sprite_accessory/head_accessory/kidan/perked_antennae
+	name = "Perked-up Antennae"
+	icon_state = "perky"
+
+/datum/sprite_accessory/head_accessory/kidan/mopey_antennae
+	name = "Mopey Antennae"
+	icon_state = "mopey"
+
+/datum/sprite_accessory/head_accessory/kidan/curious_antennae
+	name = "Curious Antennae"
+	icon_state = "curious"
+
+/datum/sprite_accessory/head_accessory/kidan/mopey_antennae
+	name = "Mopey Antennae"
+	icon_state = "mopey"
+
+/datum/sprite_accessory/head_accessory/kidan/crescent_antennae
+	name = "Crescent Antennae"
+	icon_state = "crescent"
+
+/datum/sprite_accessory/head_accessory/kidan/alert_antennae
+	name = "Alert Antennae"
+	icon_state = "alert"
+
+/datum/sprite_accessory/head_accessory/kidan/normal_antennae
+	name = "Normal Antennae"
+	icon_state = "normal"
+
+/datum/sprite_accessory/head_accessory/kidan/long_antennae
+	name = "Long Antennae"
+	icon_state = "long"
+
+/datum/sprite_accessory/head_accessory/kidan/moth_antennae
+	name = "Moth Antennae"
+	icon_state = "moth"
+
+// Sprites by Travelling Merchant
+
+/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Long
+	name = "Mantie Long"
+	icon_state = "Mantie_Long"
+
+/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Curled
+	name = "Mantie Curled"
+	icon_state = "Mantie_Curled"
+
+/datum/sprite_accessory/head_accessory/kidan/kidan_very_short
+	name = "Very Short"
+	icon_state = "very_short"
+// End

code/modules/mob/new_player/sprite_accessories/kidan/kidan_head_markings.dm

@@ -0,0 +1,7 @@
+/datum/sprite_accessory/body_markings/head/kidan
+	icon = 'icons/mob/sprite_accessories/kidan/kidan_head_markings.dmi'
+	species_allowed = list("Kidan")
+
+/datum/sprite_accessory/body_markings/head/kidan/outline_head_kid
+	name = "Kidan Outline Head"
+	icon_state = "outline"

code/modules/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm

@@ -0,0 +1,32 @@
+/datum/sprite_accessory/hair/nucleation
+	icon = 'icons/mob/sprite_accessories/nucleation/nucleation_face.dmi'
+	species_allowed = list("Nucleation")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/nucleation/nuc_crystals
+	name = "Nucleation Crystals"
+	icon_state = "crystal"
+
+/datum/sprite_accessory/hair/nucleation/nuc_betaburns
+	name = "Nucleation Beta Burns"
+	icon_state = "betaburns"
+
+/datum/sprite_accessory/hair/nucleation/nuc_fallout
+	name = "Nucleation Fallout"
+	icon_state = "fallout"
+
+/datum/sprite_accessory/hair/nucleation/nuc_frission
+	name = "Nucleation Frission"
+	icon_state = "frission"
+
+/datum/sprite_accessory/hair/nucleation/nuc_radical
+	name = "Nucleation Free Radical"
+	icon_state = "radical"
+
+/datum/sprite_accessory/hair/nucleation/nuc_gammaray
+	name = "Nucleation Gamma Ray"
+	icon_state = "gammaray"
+
+/datum/sprite_accessory/hair/nucleation/nuc_neutron
+	name = "Nucleation Neutron Bomb"
+	icon_state = "neutron"

code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm

@@ -0,0 +1,162 @@
+/datum/sprite_accessory/hair/skrell
+	icon = 'icons/mob/sprite_accessories/skrell/skrell_hair.dmi'
+	species_allowed = list("Skrell")
+
+/datum/sprite_accessory/hair/skrell/skr_tentacle_m
+	name = "Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+
+/datum/sprite_accessory/hair/skrell/skr_tentacle_f
+	name = "Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/skrell/skr_tentacleslong
+	name = "Long Skrell Tentacles"
+	icon_state = "verylong"
+
+/datum/sprite_accessory/hair/skrell/skr_tentaclesshort
+	name = "Short Skrell Tentacles"
+	icon_state = "veryshort"
+
+/datum/sprite_accessory/hair/skrell/skr_gold_m
+	name = "Gold plated Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+	secondary_theme = "gold"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_gold_f
+	name = "Gold chained Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+	secondary_theme = "gold"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_clothtentacle_m
+	name = "Cloth draped Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+	secondary_theme = "cloth"
+
+/datum/sprite_accessory/hair/skrell/skr_clothtentacle_f
+	name = "Cloth draped Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+	secondary_theme = "cloth"
+
+/datum/sprite_accessory/hair/skrell/skr_gclothtentacle_m
+	name = "Ombre Dye, Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+	secondary_theme = "gradient"
+
+/datum/sprite_accessory/hair/skrell/skr_gclothtentacle_f
+	name = "Ombre Dye, Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+	secondary_theme = "gradient"
+
+/datum/sprite_accessory/hair/skrell/skr_gclothtentacleslong
+	name = "Ombre Dye, Long Skrell Tentacles"
+	icon_state = "verylong"
+	secondary_theme = "gradient"
+
+/datum/sprite_accessory/hair/skrell/skr_gclothtentaclesshort
+	name = "Ombre Dye, Short Skrell Tentacles"
+	icon_state = "veryshort"
+	secondary_theme = "gradient"
+
+/datum/sprite_accessory/hair/skrell/skr_diablacktentacle_m
+	name = "Black headress Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+	secondary_theme = "blackdia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_diablacktentacle_f
+	name = "Black headress Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+	secondary_theme = "blackdia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_diablacktentacleslong
+	name = "Black headress Long Skrell Tentacles"
+	icon_state = "verylong"
+	secondary_theme = "blackdia"
+	no_sec_colour = 1
+
+
+/datum/sprite_accessory/hair/skrell/skr_diagoldtentacle_m
+	name = "Gold headress Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+	secondary_theme = "golddia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_diagoldtentacle_f
+	name = "Gold headress Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+	secondary_theme = "golddia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_diagoldtentacleslong
+	name = "Gold headress Long Skrell Tentacles"
+	icon_state = "verylong"
+	secondary_theme = "golddia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_diasilvertentacle_m
+	name = "Silver headress Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+	secondary_theme = "silvdia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_diasilvertentacle_f
+	name = "Silver headress Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+	secondary_theme = "silvdia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_diasilvertentacleslong
+	name = "Silver headress Long Skrell Tentacles"
+	icon_state = "verylong"
+	secondary_theme = "silvdia"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_festivetentacle_m
+	name = "Festive headress Skrell Male Tentacles"
+	icon_state = "male"
+	gender = MALE
+	secondary_theme = "fest"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_festivetentacle_f
+	name = "Festive headress Skrell Female Tentacles"
+	icon_state = "female"
+	gender = FEMALE
+	secondary_theme = "fest"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_festivetentacleslong
+	name = "Festive headress Long Skrell Tentacles"
+	icon_state = "verylong"
+	secondary_theme = "fest"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/skrell/skr_festivetentaclesshort
+	name = "Festive headress Short Skrell Tentacles"
+	icon_state = "veryshort"
+	secondary_theme = "fest"
+	no_sec_colour = 1
+
+/datum/sprite_accessory/hair/fluff/zeke_fluff_tentacle //Zeke Fluff hair
+	icon = 'icons/mob/sprite_accessories/skrell/skrell_hair.dmi'
+	name = "Zekes Tentacles"
+	icon_state = "zeke_fluff_hair"
+	species_allowed = list("Skrell")

code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm

@@ -0,0 +1,652 @@
+/*
+
+	Hello and welcome to sprite_accessories: For sprite accessories, such as hair,
+	facial hair, and possibly tattoos and stuff somewhere along the line. This file is
+	intended to be friendly for people with little to no actual coding experience.
+	The process of adding in new hairstyles has been made pain-free and easy to do.
+	Enjoy! - Doohl
+
+
+	Notice: This all gets automatically compiled in a list in dna2.dm, so you do not
+	have to define any UI values for sprite accessories manually for hair and facial
+	hair. Just add in new hair types and the game will naturally adapt.
+
+	!!WARNING!!: changing existing hair information can be VERY hazardous to savefiles,
+	to the point where you may completely corrupt a server's savefiles. Please refrain
+	from doing this unless you absolutely know what you are doing, and have defined a
+	conversion in savefile.dm
+*/
+
+/proc/init_sprite_accessory_subtypes(var/prototype, var/list/L, var/list/male, var/list/female, var/list/full_list)
+	if(!istype(L))	L = list()
+	if(!istype(male))	male = list()
+	if(!istype(female))	female = list()
+	if(!istype(full_list))	full_list = list()
+
+	for(var/path in subtypesof(prototype))
+		var/datum/sprite_accessory/D = new path()
+
+		if(D.name)
+			if(D.fluff)
+				full_list[D.name] = D
+			else
+				L[D.name] = D
+				full_list[D.name] = D
+
+			switch(D.gender)
+				if(MALE)	male[D.name] = D
+				if(FEMALE)	female[D.name] = D
+				else
+					male[D.name] = D
+					female[D.name] = D
+	return L
+
+/datum/sprite_accessory
+	var/icon			//the icon file the accessory is located in
+	var/icon_state		//the icon_state of the accessory
+	var/name			//the preview name of the accessory
+	var/gender = NEUTER	//Determines if the accessory will be skipped or included in random hair generations
+
+	// Restrict some styles to specific species
+	var/list/species_allowed = list("Human", "Slime People")
+	var/list/models_allowed = list() //Specifies which, if any, hairstyles or markings can be accessed by which prosthetics. Should equal the manufacturing company name in robolimbs.dm.
+	var/list/heads_allowed = null //Specifies which, if any, alt heads a head marking, hairstyle or facial hair style is compatible with.
+	var/list/tails_allowed = null //Specifies which, if any, tails a tail marking is compatible with.
+	var/marking_location //Specifies which bodypart a body marking is located on.
+	var/secondary_theme = null //If exists, there's a secondary colour to that hair style and the secondary theme's icon state's suffix is equal to this.
+	var/no_sec_colour = null //If exists, prohibit the colouration of the secondary theme.
+	var/fluff = 0
+	// Whether or not the accessory can be affected by colouration
+	var/do_colouration = 1
+
+/* HAIR */
+
+/datum/sprite_accessory/hair
+	icon = 'icons/mob/sprite_accessories/human/human_hair.dmi'	  // default icon for all human hair. Override if it doesn't belong to human. Human hair that is shared belongs in human file.
+	var/glasses_over //Hair styles with hair that don't overhang the arms of glasses should have glasses_over set to a positive value
+
+/datum/sprite_accessory/hair/bald
+	icon = 'icons/mob/human_face.dmi' // Keep bald hair here, as for some reason, putting it elsewhere lead to it being colourable - Also it make sense as it is shared by everyone.
+	name = "Bald"
+	icon_state = "bald"
+	species_allowed = list("Human", "Unathi", "Vox", "Diona", "Kidan", "Grey", "Plasmaman", "Skeleton", "Vulpkanin", "Tajaran")
+	glasses_over = 1
+
+/datum/sprite_accessory/facial_hair
+	gender = MALE // barf (unless you're a dorf, dorfs dig chix /w beards :P)
+	icon = 'icons/mob/sprite_accessories/human/human_facial_hair.dmi'
+	var/over_hair
+
+/datum/sprite_accessory/hair/fluff
+	fluff = 1
+
+/* HEAD ACCESSORY */
+
+/datum/sprite_accessory/head_accessory
+	icon = 'icons/mob/body_accessory.dmi'
+	species_allowed = list("Unathi", "Vulpkanin", "Tajaran", "Machine")
+	icon_state = "accessory_none"
+	var/over_hair
+
+/datum/sprite_accessory/head_accessory/none
+	name = "None"
+	species_allowed = list("Human", "Unathi", "Diona", "Grey", "Kidan", "Machine", "Tajaran", "Vulpkanin", "Skrell", "Slime People", "Skeleton", "Vox")
+	icon_state = "accessory_none"
+
+/* BODY MARKINGS */
+
+/datum/sprite_accessory/body_markings
+	icon = 'icons/mob/sprite_accessories/human/human_body_markings.dmi'
+	species_allowed = list("Unathi", "Tajaran", "Vulpkanin", "Machine", "Vox", "Kidan")
+	icon_state = "accessory_none"
+	marking_location = "body"
+
+/datum/sprite_accessory/body_markings/head
+	marking_location = "head"
+	species_allowed = list()
+
+
+/datum/sprite_accessory/body_markings/tail
+	species_allowed = list()
+	icon_state = "accessory_none"
+	marking_location = "tail"
+	tails_allowed = null
+
+/* ALT HEADS */
+
+/datum/sprite_accessory/alt_heads
+	icon = null
+	icon_state = null
+	species_allowed = null
+	var/suffix = null
+
+/datum/sprite_accessory/alt_heads/none
+	name = "None"
+
+//skin styles - WIP
+//going to have to re-integrate this with surgery
+//let the icon_state hold an icon preview for now
+/datum/sprite_accessory/skin
+	icon = 'icons/mob/human_races/r_human.dmi'
+
+/datum/sprite_accessory/skin/human
+	name = "Default human skin"
+	icon_state = "default"
+	species_allowed = list("Human",)
+
+/datum/sprite_accessory/skin/human/human_tatt01
+	name = "Tatt01 human skin"
+	icon_state = "tatt1"
+
+/datum/sprite_accessory/skin/tajaran
+	name = "Default tajaran skin"
+	icon_state = "default"
+	icon = 'icons/mob/human_races/r_tajaran.dmi'
+	species_allowed = list("Tajaran")
+
+/datum/sprite_accessory/skin/vulpkanin
+	name = "Default Vulpkanin skin"
+	icon_state = "default"
+	icon = 'icons/mob/human_races/r_vulpkanin.dmi'
+	species_allowed = list("Vulpkanin")
+
+/datum/sprite_accessory/skin/unathi
+	name = "Default Unathi skin"
+	icon_state = "default"
+	icon = 'icons/mob/human_races/r_lizard.dmi'
+	species_allowed = list("Unathi")
+
+/datum/sprite_accessory/skin/skrell
+	name = "Default skrell skin"
+	icon_state = "default"
+	icon = 'icons/mob/human_races/r_skrell.dmi'
+	species_allowed = list("Skrell")
+
+///////////////////////////
+// Underwear Definitions //
+///////////////////////////
+/datum/sprite_accessory/underwear
+	icon = 'icons/mob/underwear.dmi'
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask")
+	gender = NEUTER
+
+/datum/sprite_accessory/underwear/nude
+	name = "Nude"
+	icon_state = null
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
+
+/datum/sprite_accessory/underwear/male
+	gender = MALE
+
+/datum/sprite_accessory/underwear/male/male_white
+	name = "Mens White"
+	icon_state = "male_white"
+
+/datum/sprite_accessory/underwear/male/male_grey
+	name = "Mens Grey"
+	icon_state = "male_grey"
+
+/datum/sprite_accessory/underwear/male/male_grey
+	name = "Mens Grey Alt"
+	icon_state = "male_greyalt"
+
+/datum/sprite_accessory/underwear/male/male_green
+	name = "Mens Green"
+	icon_state = "male_green"
+
+/datum/sprite_accessory/underwear/male/male_blue
+	name = "Mens Blue"
+	icon_state = "male_blue"
+
+/datum/sprite_accessory/underwear/male/male_red
+	name = "Mens Red"
+	icon_state = "male_red"
+
+/datum/sprite_accessory/underwear/male/male_black
+	name = "Mens Black"
+	icon_state = "male_black"
+
+/datum/sprite_accessory/underwear/male/male_black_alt
+	name = "Mens Black Alt"
+	icon_state = "male_blackalt"
+
+/datum/sprite_accessory/underwear/male/male_striped
+	name = "Mens Striped"
+	icon_state = "male_stripe"
+
+/datum/sprite_accessory/underwear/male/male_heart
+	name = "Mens Hearts"
+	icon_state = "male_hearts"
+
+/datum/sprite_accessory/underwear/male/male_kinky
+	name = "Mens Kinky"
+	icon_state = "male_kinky"
+
+/datum/sprite_accessory/underwear/male/male_mankini
+	name = "Mankini"
+	icon_state = "male_mankini"
+
+/datum/sprite_accessory/underwear/female
+	gender = FEMALE
+
+/datum/sprite_accessory/underwear/female/female_red
+	name = "Ladies Red"
+	icon_state = "female_red"
+
+/datum/sprite_accessory/underwear/female/female_green
+	name = "Ladies Green"
+	icon_state = "female_green"
+
+/datum/sprite_accessory/underwear/female/female_white
+	name = "Ladies White"
+	icon_state = "female_white"
+
+/datum/sprite_accessory/underwear/female/female_whiter
+	name = "Ladies Whiter"
+	icon_state = "female_whiter"
+
+/datum/sprite_accessory/underwear/female/female_whitealt
+	name = "Ladies White Alt"
+	icon_state = "female_whitealt"
+
+/datum/sprite_accessory/underwear/female/female_yellow
+	name = "Ladies Yellow"
+	icon_state = "female_yellow"
+
+/datum/sprite_accessory/underwear/female/female_blue
+	name = "Ladies Blue"
+	icon_state = "female_blue"
+/datum/sprite_accessory/underwear/female/female_babyblue
+	name = "Ladies Baby Blue"
+	icon_state = "female_babyblue"
+
+/datum/sprite_accessory/underwear/female/female_black
+	name = "Ladies Black"
+	icon_state = "female_black"
+
+/datum/sprite_accessory/underwear/female/female_blacker
+	name = "Ladies Blacker"
+	icon_state = "female_blacker"
+
+/datum/sprite_accessory/underwear/female/female_blackalt
+	name = "Ladies Black Alt"
+	icon_state = "female_blackalt"
+
+/datum/sprite_accessory/underwear/female/female_kinky
+	name = "Ladies Kinky"
+	icon_state = "female_kinky"
+
+/datum/sprite_accessory/underwear/female/female_babydoll
+	name = "Ladies Full Grey"
+	icon_state = "female_babydoll"
+
+/datum/sprite_accessory/underwear/female/female_pink
+	name = "Ladies Pink"
+	icon_state = "female_pink"
+
+/datum/sprite_accessory/underwear/female/female_thong
+	name = "Ladies Thong"
+	icon_state = "female_thong"
+
+////////////////////////////
+// Undershirt Definitions //
+////////////////////////////
+/datum/sprite_accessory/undershirt
+	icon = 'icons/mob/underwear.dmi'
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask")
+	gender = NEUTER
+
+/datum/sprite_accessory/undershirt/nude
+	name = "Nude"
+	icon_state = null
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
+
+//plain color shirts
+/datum/sprite_accessory/undershirt/shirt_white
+	name = "White Shirt"
+	icon_state = "shirt_white"
+
+/datum/sprite_accessory/undershirt/shirt_black
+	name = "Black Shirt"
+	icon_state = "shirt_black"
+
+/datum/sprite_accessory/undershirt/shirt_blacker
+	name = "Blacker Shirt"
+	icon_state = "shirt_blacker"
+
+/datum/sprite_accessory/undershirt/shirt_grey
+	name = "Grey Shirt"
+	icon_state = "shirt_grey"
+
+/datum/sprite_accessory/undershirt/shirt_red
+	name = "Red Shirt"
+	icon_state = "shirt_red"
+
+/datum/sprite_accessory/undershirt/shirt_blue
+	name = "Blue Shirt"
+	icon_state = "shirt_blue"
+
+/datum/sprite_accessory/undershirt/shirt_yellow
+	name = "Yellow Shirt"
+	icon_state = "shirt_yellow"
+
+/datum/sprite_accessory/undershirt/shirt_green
+	name = "Green Shirt"
+	icon_state = "shirt_green"
+
+/datum/sprite_accessory/undershirt/shirt_darkblue
+	name = "Dark Blue Shirt"
+	icon_state = "shirt_darkblue"
+
+/datum/sprite_accessory/undershirt/shirt_darkred
+	name = "Dark Red Shirt"
+	icon_state = "shirt_darkred"
+
+/datum/sprite_accessory/undershirt/shirt_darkgreen
+	name = "Dark Green Shirt"
+	icon_state = "shirt_darkgreen"
+//end plain color shirts
+
+//graphic shirts
+/datum/sprite_accessory/undershirt/shirt_heart
+	name = "Heart Shirt"
+	icon_state = "shirt_heart"
+
+/datum/sprite_accessory/undershirt/shirt_corgi
+	name = "Corgi Shirt"
+	icon_state = "shirt_corgi"
+
+/datum/sprite_accessory/undershirt/shirt_clown
+	name = "Clown Shirt"
+	icon_state = "shirt_clown"
+
+/datum/sprite_accessory/undershirt/shirt_alien
+	name = "Alien Shirt"
+	icon_state = "shirt_alien"
+
+/datum/sprite_accessory/undershirt/shirt_jack
+	name = "Union Jack Shirt"
+	icon_state = "shirt_jack"
+
+/datum/sprite_accessory/undershirt/love_nt
+	name = "I Love NT Shirt"
+	icon_state = "shirt_lovent"
+
+/datum/sprite_accessory/undershirt/peace
+	name = "Peace Shirt"
+	icon_state = "shirt_peace"
+
+/datum/sprite_accessory/undershirt/mondmondjaja
+	name = "Band Shirt"
+	icon_state = "shirt_band"
+
+/datum/sprite_accessory/undershirt/pacman
+	name = "Pogoman Shirt"
+	icon_state = "shirt_pogoman"
+
+/datum/sprite_accessory/undershirt/shirt_ss13
+	name = "SS13 Shirt"
+	icon_state = "shirt_ss13"
+
+/datum/sprite_accessory/undershirt/shirt_question
+	name = "Question Mark Shirt"
+	icon_state = "shirt_question"
+
+/datum/sprite_accessory/undershirt/shirt_skull
+	name = "Skull Shirt"
+	icon_state = "shirt_skull"
+
+/datum/sprite_accessory/undershirt/shirt_commie
+	name = "Communist Shirt"
+	icon_state = "shirt_commie"
+
+/datum/sprite_accessory/undershirt/shirt_nano
+	name = "Nanotrasen Shirt"
+	icon_state = "shirt_nano"
+
+/datum/sprite_accessory/undershirt/shirt_meat
+	name = "Meat Shirt"
+	icon_state = "shirt_meat"
+
+/datum/sprite_accessory/undershirt/shirt_tiedie
+	name = "Tiedie Shirt"
+	icon_state = "shirt_tiedie"
+
+/datum/sprite_accessory/undershirt/blue_striped
+	name = "Striped Blue Shirt"
+	icon_state = "shirt_bluestripe"
+
+/datum/sprite_accessory/undershirt/brightblue_striped
+	name = "Striped Bright Blue Shirt"
+	icon_state = "shirt_brightbluestripe"
+//end graphic shirts
+
+//short sleeved
+/datum/sprite_accessory/undershirt/short_white
+	name = "White Short-sleeved Shirt"
+	icon_state = "short_white"
+
+/datum/sprite_accessory/undershirt/short_purple
+	name = "Purple Short-sleeved Shirt"
+	icon_state = "short_purple"
+
+/datum/sprite_accessory/undershirt/short_blue
+	name = "Blue Short-sleeved Shirt"
+	icon_state = "short_blue"
+
+/datum/sprite_accessory/undershirt/short_green
+	name = "Green Short-sleeved Shirt"
+	icon_state = "short_green"
+
+/datum/sprite_accessory/undershirt/short_black
+	name = "Black Short-sleeved Shirt"
+	icon_state = "short_black"
+//end short sleeved
+
+//polo shirts
+/datum/sprite_accessory/undershirt/polo_blue
+	name = "Blue Polo Shirt"
+	icon_state = "polo_blue"
+
+/datum/sprite_accessory/undershirt/polo_red
+	name = "Red Polo Shirt"
+	icon_state = "polo_red"
+
+/datum/sprite_accessory/undershirt/polo_greyelllow
+	name = "Grey-Yellow Polo Shirt"
+	icon_state = "polo_greyellow"
+//end polo shirts
+
+//sport shirts
+/datum/sprite_accessory/undershirt/sport_green
+	name = "Green Sports Shirt"
+	icon_state = "sport_green"
+
+/datum/sprite_accessory/undershirt/sport_red
+	name = "Red Sports Shirt"
+	icon_state = "sport_red"
+
+/datum/sprite_accessory/undershirt/sport_blue
+	name = "Blue Sports Shirt"
+	icon_state = "sport_blue"
+
+/datum/sprite_accessory/undershirt/jersey_red
+	name = "Red Jersey"
+	icon_state = "jersey_red"
+
+/datum/sprite_accessory/undershirt/jersey_blue
+	name = "Blue Jersey"
+	icon_state = "jersey_blue"
+//end sport shirts
+
+//tanktops
+/datum/sprite_accessory/undershirt/tank_redtop
+	name = "Red Crop-Top"
+	icon_state = "tank_redtop"
+	gender = FEMALE
+
+/datum/sprite_accessory/undershirt/tank_whitetop
+	name = "White Crop-Top"
+	icon_state = "tank_whitetop"
+	gender = FEMALE
+
+/datum/sprite_accessory/undershirt/tank_midriff
+	name = "White Mid Tank-Top"
+	icon_state = "tank_midriff"
+	gender = FEMALE
+
+/datum/sprite_accessory/undershirt/tank_white
+	name = "White Tank-Top"
+	icon_state = "tank_white"
+
+/datum/sprite_accessory/undershirt/tank_black
+	name = "Black Tank-Top"
+	icon_state = "tank_black"
+
+/datum/sprite_accessory/undershirt/tank_blacker
+	name = "Blacker Tank-Top"
+	icon_state = "tank_blacker"
+
+/datum/sprite_accessory/undershirt/tank_grey
+	name = "Grey Tank-Top"
+	icon_state = "tank_grey"
+
+/datum/sprite_accessory/undershirt/tank_red
+	name = "Red Tank-Top"
+	icon_state = "tank_red"
+
+/datum/sprite_accessory/undershirt/tank_fire
+	name = "Fire Tank-Top"
+	icon_state = "tank_fire"
+
+/datum/sprite_accessory/undershirt/tank_stripes
+	name = "Striped Tank-Top"
+	icon_state = "tank_stripes"
+//end tanktops
+
+///////////////////////
+// Socks Definitions //
+///////////////////////
+/datum/sprite_accessory/socks
+	icon = 'icons/mob/underwear.dmi'
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask")
+	gender = NEUTER
+
+/datum/sprite_accessory/socks/nude
+	name = "Nude"
+	icon_state = null
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
+
+/datum/sprite_accessory/socks/white_norm
+	name = "Normal White"
+	icon_state = "white_norm"
+
+/datum/sprite_accessory/socks/black_norm
+	name = "Normal Black"
+	icon_state = "black_norm"
+
+/datum/sprite_accessory/socks/white_short
+	name = "Short White"
+	icon_state = "white_short"
+
+/datum/sprite_accessory/socks/black_short
+	name = "Short Black"
+	icon_state = "black_short"
+
+/datum/sprite_accessory/socks/white_knee
+	name = "Knee-high White"
+	icon_state = "white_knee"
+
+/datum/sprite_accessory/socks/black_knee
+	name = "Knee-high Black"
+	icon_state = "black_knee"
+
+/datum/sprite_accessory/socks/thin_knee
+	name = "Knee-high Thin"
+	icon_state = "thin_knee"
+	gender = FEMALE
+
+/datum/sprite_accessory/socks/striped_knee
+	name = "Knee-high Striped"
+	icon_state = "striped_knee"
+
+/datum/sprite_accessory/socks/rainbow_knee
+	name = "Knee-high Rainbow"
+	icon_state = "rainbow_knee"
+
+/datum/sprite_accessory/socks/white_thigh
+	name = "Thigh-high White"
+	icon_state = "white_thigh"
+
+/datum/sprite_accessory/socks/black_thigh
+	name = "Thigh-high Black"
+	icon_state = "black_thigh"
+
+/datum/sprite_accessory/socks/thin_thigh
+	name = "Thigh-high Thin"
+	icon_state = "thin_thigh"
+	gender = FEMALE
+
+/datum/sprite_accessory/socks/striped_thigh
+	name = "Thigh-high Striped"
+	icon_state = "striped_thigh"
+
+/datum/sprite_accessory/socks/rainbow_thigh
+	name = "Thigh-high Rainbow"
+	icon_state = "rainbow_thigh"
+
+/datum/sprite_accessory/socks/pantyhose
+	name = "Pantyhose"
+	icon_state = "pantyhose"
+	gender = FEMALE
+
+/datum/sprite_accessory/socks/black_fishnet
+	name = "Black Fishnet"
+	icon_state = "black_fishnet"
+
+/datum/sprite_accessory/socks/vox
+	species_allowed = list("Vox")
+
+/datum/sprite_accessory/socks/vox/vox_white
+	name = "Vox White"
+	icon_state = "vox_white"
+
+/datum/sprite_accessory/socks/vox/vox_black
+	name = "Vox Black"
+	icon_state = "vox_black"
+
+/datum/sprite_accessory/socks/vox/vox_thin
+	name = "Vox Black Thin"
+	icon_state = "vox_blackthin"
+
+/datum/sprite_accessory/socks/vox/vox_rainbow
+	name = "Vox Rainbow"
+	icon_state = "vox_rainbow"
+
+/datum/sprite_accessory/socks/vox/vox_stripped
+	name = "Vox Striped"
+	icon_state = "vox_white"
+
+/datum/sprite_accessory/socks/vox/vox_white_thigh
+	name = "Vox Thigh-high White"
+	icon_state = "vox_whiteTH"
+
+/datum/sprite_accessory/socks/vox/vox_black_thigh
+	name = "Vox Thigh-high Black"
+	icon_state = "vox_blackTH"
+
+/datum/sprite_accessory/socks/vox/vox_thin_thigh
+	name = "Vox Thigh-high Thin"
+	icon_state = "vox_blackthinTH"
+
+/datum/sprite_accessory/socks/vox/vox_rainbow_thigh
+	name = "Vox Thigh-high Rainbow"
+	icon_state = "vox_rainbowTH"
+
+/datum/sprite_accessory/socks/vox/vox_striped_thigh
+	name = "Vox Thigh-high Striped"
+	icon_state = "vox_stripedTH"
+
+/datum/sprite_accessory/socks/vox/vox_fishnet
+	name = "Vox Fishnets"
+	icon_state = "vox_fishnet"

code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_body_markings.dm

@@ -0,0 +1,23 @@
+/datum/sprite_accessory/body_markings/tajara
+	icon = 'icons/mob/sprite_accessories/tajaran/tajaran_body_markings.dmi'
+	species_allowed = list("Tajaran")
+
+/datum/sprite_accessory/body_markings/tajara/belly_flat_taj
+	name = "Tajaran Belly"
+	icon_state = "belly"
+
+/datum/sprite_accessory/body_markings/tajara/belly_crest_taj
+	name = "Tajaran Chest Crest"
+	icon_state = "crest"
+
+/datum/sprite_accessory/body_markings/tajara/belly_full_taj
+	name = "Tajaran Belly 2"
+	icon_state = "fullbelly"
+
+/datum/sprite_accessory/body_markings/tajara/points_taj
+	name = "Tajaran Points"
+	icon_state = "points"
+
+/datum/sprite_accessory/body_markings/tajara/patchy_taj
+	name = "Tajaran Patches"
+	icon_state = "patch"

code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_facial_hair.dm

@@ -0,0 +1,31 @@
+/datum/sprite_accessory/facial_hair/tajara
+	icon = 'icons/mob/sprite_accessories/tajaran/tajaran_facial_hair.dmi'
+	species_allowed = list("Tajaran")
+
+/datum/sprite_accessory/facial_hair/tajara/taj_sideburns
+	name = "Tajara Sideburns"
+	icon_state = "facial_sideburns"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_mutton
+	name = "Tajara Mutton"
+	icon_state = "facial_mutton"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_pencilstache
+	name = "Tajara Pencilstache"
+	icon_state = "facial_pencilstache"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_moustache
+	name = "Tajara Moustache"
+	icon_state = "facial_moustache"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_goatee
+	name = "Tajara Goatee"
+	icon_state = "facial_goatee"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_goatee_faded
+	name = "Tajara Faded Goatee"
+	icon_state = "facial_goatee_faded"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_smallstache
+	name = "Tajara Smallstache"
+	icon_state = "facial_smallstache"

code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_hair.dm

@@ -0,0 +1,81 @@
+/datum/sprite_accessory/hair/tajara
+	icon = 'icons/mob/sprite_accessories/tajaran/tajaran_hair.dmi'
+	species_allowed = list("Tajaran")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/tajara/taj_hair_clean
+	name = "Tajara Clean"
+	icon_state = "clean"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_bangs
+	name = "Tajara Bangs"
+	icon_state = "bangs"
+	glasses_over = null
+
+/datum/sprite_accessory/hair/tajara/taj_hair_braid
+	name = "Tajara Braid"
+	icon_state = "braid"
+	secondary_theme = "beads"
+	glasses_over = null
+
+/datum/sprite_accessory/hair/tajara/taj_hair_shaggy
+	name = "Tajara Shaggy"
+	icon_state = "shaggy"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_mohawk
+	name = "Tajaran Mohawk"
+	icon_state = "mohawk"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_plait
+	name = "Tajara Plait"
+	icon_state = "plait"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_straight
+	name = "Tajara Straight"
+	icon_state = "straight"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_long
+	name = "Tajara Long"
+	icon_state = "long"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_rattail
+	name = "Tajara Rat Tail"
+	icon_state = "rattail"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_spiky
+	name = "Tajara Spikey"
+	icon_state = "spikey"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_messy
+	name = "Tajara Messy"
+	icon_state = "messy"
+
+/datum/sprite_accessory/hair/tajara/taj_hair_curls
+	name = "Tajara Curly"
+	icon_state = "curly"
+	glasses_over = null
+
+/datum/sprite_accessory/hair/tajara/taj_hair_bedhead
+	name = "Tajara bedhead"
+	icon_state = "bedhead"
+	glasses_over = null
+
+/datum/sprite_accessory/hair/tajara/taj_hair_retro
+	name = "Tajaran Ladies' Retro"
+	icon_state = "ladiesretro"
+	glasses_over = null
+
+/datum/sprite_accessory/hair/tajara/taj_hair_victory
+	name = "Tajara Victory Curls"
+	icon_state = "victory"
+	glasses_over = null
+
+/datum/sprite_accessory/hair/tajara/taj_hair_bob
+	name = "Tajara Bob"
+	icon_state = "bob"
+	glasses_over = null
+
+/datum/sprite_accessory/hair/tajara/taj_hair_fingercurl
+	name = "Tajara Finger Curls"
+	icon_state = "fingerwave"
+	glasses_over = null

code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_accessories.dm

@@ -0,0 +1,32 @@
+/datum/sprite_accessory/head_accessory/tajara
+    icon = 'icons/mob/sprite_accessories/tajaran/tajaran_head_accessories.dmi' // Nearly all head accessories are head markings, however this is the default for consistency sake
+    species_allowed = list("Tajaran")
+
+/datum/sprite_accessory/head_accessory/tajara/taj_ears
+    name = "Tajaran Ears"
+    icon_state = "ears_plain"
+
+/datum/sprite_accessory/head_accessory/tajara/outears_taj
+    icon = 'icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi'
+    name = "Tajaran Outer Ears"
+    icon_state = "outears"
+
+/datum/sprite_accessory/head_accessory/tajara/inears_taj
+    icon = 'icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi'
+    name = "Tajaran Inner Ears"
+    icon_state = "inears"
+
+/datum/sprite_accessory/head_accessory/tajara/muzzle_taj
+    icon = 'icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi'
+    name = "Tajaran Muzzle"
+    icon_state = "muzzle"
+
+/datum/sprite_accessory/head_accessory/tajara/muzzle_and_inears_taj
+    icon = 'icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi'
+    name = "Tajaran Muzzle and Inner Ears"
+    icon_state = "muzinears"
+
+/datum/sprite_accessory/head_accessory/tajara/taj_nose
+    icon = 'icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi'
+    name = "Tajaran Nose"
+    icon_state = "nose"

code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm

@@ -0,0 +1,44 @@
+
+/datum/sprite_accessory/body_markings/head/tajara
+    icon = 'icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi'
+    species_allowed = list("Tajaran")
+
+/datum/sprite_accessory/body_markings/head/tajara/tiger_head_taj
+	name = "Tajaran Tiger Head"
+	icon_state = "tiger_head"
+
+/datum/sprite_accessory/body_markings/head/tajara/tiger_face_taj
+	name = "Tajaran Tiger Head and Face"
+	icon_state = "tiger_face"
+
+/datum/sprite_accessory/body_markings/head/tajara/outears_taj
+	name = "Tajaran Outer Ears"
+	icon_state = "outears"
+
+/datum/sprite_accessory/body_markings/head/tajara/inears_taj
+	name = "Tajaran Inner Ears"
+	icon_state = "inears"
+
+/datum/sprite_accessory/body_markings/head/tajara/nose_taj
+	name = "Tajaran Nose"
+	icon_state = "nose"
+
+/datum/sprite_accessory/body_markings/head/tajara/muzzle_taj
+	name = "Tajaran Muzzle"
+	icon_state = "muzzle"
+
+/datum/sprite_accessory/body_markings/head/tajara/muzzle_and_inears_taj
+	name = "Tajaran Muzzle and Inner Ears"
+	icon_state = "muzinears"
+
+/datum/sprite_accessory/body_markings/head/tajara/muzzle_alt_taj //Companion marking for Tajaran Belly 2.
+	name = "Tajaran Muzzle 2"
+	icon_state = "muzzle2"
+
+/datum/sprite_accessory/body_markings/head/tajara/points_taj //Companion marking for Tajaran Points.
+	name = "Tajaran Points Head"
+	icon_state = "points"
+
+/datum/sprite_accessory/body_markings/head/tajara/patchy_taj //Companion marking for Tajaran Patches.
+	name = "Tajaran Patches Head"
+	icon_state = "patch"

code/modules/mob/new_player/sprite_accessories/unathi/unathi_alt_heads.dm

@@ -0,0 +1,5 @@
+/datum/sprite_accessory/alt_heads/una_sharp_snout
+	name = "Unathi Sharp Snout"
+	species_allowed = list("Unathi")
+	icon_state = "head_sharp"
+	suffix = "sharp"

code/modules/mob/new_player/sprite_accessories/unathi/unathi_body_markings.dm

@@ -0,0 +1,19 @@
+/datum/sprite_accessory/body_markings/unathi
+    icon = 'icons/mob/sprite_accessories/unathi/unathi_body_markings.dmi'
+    species_allowed = list("Unathi")
+
+/datum/sprite_accessory/body_markings/unathi/stripe_una
+	name = "Unathi Stripe"
+	icon_state = "stripe"
+
+/datum/sprite_accessory/body_markings/unathi/belly_narrow_una
+	name = "Unathi Belly"
+	icon_state = "belly"
+
+/datum/sprite_accessory/body_markings/unathi/banded_una
+	name = "Unathi Banded"
+	icon_state = "banded"
+
+/datum/sprite_accessory/body_markings/unathi/points_una
+	name = "Unathi Points"
+	icon_state = "points"

code/modules/mob/new_player/sprite_accessories/unathi/unathi_facial_hair.dm

@@ -0,0 +1,76 @@
+/datum/sprite_accessory/facial_hair/unathi
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_facial_hair.dmi'
+	species_allowed = list("Unathi")
+	gender = NEUTER
+	over_hair = 1
+
+/datum/sprite_accessory/facial_hair/unathi/una_spines_long
+	name = "Long Spines"
+	icon_state = "longspines"
+
+/datum/sprite_accessory/facial_hair/unathi/una_spines_short
+	name = "Short Spines"
+	icon_state = "shortspines"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_aquaspine
+	name = "Spiny Aquatic Frills"
+	icon_state = "dracfrills"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_aquatic
+	name = "Aquatic Frills"
+	icon_state = "aquaticfrills"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_long
+	name = "Long Frills"
+	icon_state = "longfrills"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_short
+	name = "Short Frills"
+	icon_state = "shortfrills"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_aquaspine
+	name = "Spiny Aquatic Webbed Frills"
+	icon_state = "dracfrills"
+	secondary_theme = "webbing"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_aquatic
+	name = "Aquatic Webbed Frills"
+	icon_state = "aquaticfrills"
+	secondary_theme = "webbing"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_long
+	name = "Long Webbed Frills"
+	icon_state = "longfrills"
+	secondary_theme = "webbing"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_short
+	name = "Short Webbed Frills"
+	icon_state = "shortfrills"
+	secondary_theme = "webbing"
+
+// These hairstyles are repeated from unathi_hair
+/datum/sprite_accessory/facial_hair/unathi/una_side_frills
+	name = "Side Frills"
+	icon_state = "sidefrills"
+	secondary_theme = "webbing"
+    
+/datum/sprite_accessory/facial_hair/unathi/una_frills_dorsal
+	over_hair = null
+	name = "Dorsal Frills"
+	icon_state = "dorsalfrills"
+	secondary_theme = "webbing"
+
+/datum/sprite_accessory/facial_hair/unathi/una_chin_horns
+	name = "Chin Horns"
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi'
+	icon_state = "chin_horns"
+
+/datum/sprite_accessory/facial_hair/unathi/una_horn_adorns
+	name = "Horn Adorns"
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi'
+	icon_state = "adorns_horns"
+
+/datum/sprite_accessory/facial_hair/unathi/una_spikes
+	name = "Spikes"
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi'
+	icon_state = "spikes_horns"

code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm

@@ -0,0 +1,77 @@
+/datum/sprite_accessory/hair/unathi
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi'
+	species_allowed = list("Unathi")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/braid_hip_una // Future coder: Change the typepath under unathi. This is a legacy of my accessories splitting PR where typepath change is avoided at all cost
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi'
+	name = "Unathi Hippie Braid"
+	icon_state = "hipbraid"
+	species_allowed = list("Unathi")
+	secondary_theme = "beads"
+
+/datum/sprite_accessory/hair/unathi/una_cobra_hood
+    name = "Unathi Cobra Hood"
+    icon_state = "cobrahood"
+    secondary_theme = "webbing"
+	
+/datum/sprite_accessory/hair/unathi/simple
+	name = "Simple Horns"
+	icon_state = "simple_horns"
+
+/datum/sprite_accessory/hair/unathi/short
+	name = "Short Horns"
+	icon_state = "short_horns"
+
+/datum/sprite_accessory/hairy/unathi/curled
+	name = "Curled Horns"
+	icon_state = "curled_horns"
+
+/datum/sprite_accessory/hair/unathi/ram
+	name = "Ram Horns"
+	icon_state = "ram_horns"
+
+/datum/sprite_accessory/hair/unathi/double
+	name = "Double Horns"
+	icon_state = "drac_horns"
+
+/datum/sprite_accessory/hair/unathi/lower
+	name = "Lower Horns"
+	icon_state = "lower_horns"
+
+/datum/sprite_accessory/hair/unathi/big
+	name = "Big"
+	icon_state = "big_horns"
+
+/datum/sprite_accessory/hair/unathi/ram2
+	name = "Ram alt."
+	icon_state = "ram2_horns"
+
+/datum/sprite_accessory/hair/unathi/small
+	name = "Small"
+	icon_state = "small_horns"
+
+// BOTTOM / SIDE HAIR STYLE, shared with facial hair
+/datum/sprite_accessory/hair/unathi/una_side_frills
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_facial_hair.dmi'
+	name = "Unathi Side Frills"
+	icon_state = "sidefrills"
+	secondary_theme = "webbing"
+
+/datum/sprite_accessory/hair/unathi/chin
+	name = "Chin"
+	icon_state = "chin_horns"
+
+/datum/sprite_accessory/hair/unathi/adorns
+	name = "Adorns"
+	icon_state = "adorns_horns"
+
+/datum/sprite_accessory/hair/unathi/spikes
+	name = "Spikes"
+	icon_state = "spikes_horns"
+
+/datum/sprite_accessory/hair/unathi/una_frills_dorsal
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_facial_hair.dmi'
+	name = "Dorsal Frills"
+	icon_state = "dorsalfrills"
+	secondary_theme = "webbing"

code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_accessories.dm

@@ -0,0 +1,54 @@
+// Unathi head accessories are all shared with hairstyle. So they redirect to the same file.
+
+/datum/sprite_accessory/head_accessory/unathi
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi'
+	species_allowed = list("Unathi")
+	over_hair = 1
+
+/datum/sprite_accessory/head_accessory/unathi/simple
+	name = "Simple"
+	icon_state = "simple_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/short
+	name = "Short"
+	icon_state = "short_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/curled
+	name = "Curled"
+	icon_state = "curled_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/ram
+	name = "Ram"
+	icon_state = "ram_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/double
+	name = "Double"
+	icon_state = "drac_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/lower
+	name = "Lower"
+	icon_state = "lower_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/big
+	name = "Big"
+	icon_state = "big_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/ram2
+	name = "Ram alt."
+	icon_state = "ram2_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/small
+	name = "Small"
+	icon_state = "small_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/chin
+	name = "Chin"
+	icon_state = "chin_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/adorns
+	name = "Adorns"
+	icon_state = "adorns_horns"
+
+/datum/sprite_accessory/head_accessory/unathi/spikes
+	name = "Spikes"
+	icon_state = "spikes_horns"

code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm

@@ -0,0 +1,53 @@
+/datum/sprite_accessory/body_markings/head/unathi
+	icon = 'icons/mob/sprite_accessories/unathi/unathi_head_markings.dmi'
+	species_allowed = list("Unathi")
+
+/datum/sprite_accessory/body_markings/head/unathi/tiger_head_una
+	name = "Unathi Tiger Head"
+	icon_state = "tigerhead"
+	heads_allowed = list("All")
+
+/datum/sprite_accessory/body_markings/head/unathi/tiger_face_una
+	name = "Unathi Tiger Head and Face"
+	icon_state = "tigerface"
+
+/datum/sprite_accessory/body_markings/head/unathi/snout_una_round
+	name = "Unathi Round Snout"
+	icon_state = "snoutround"
+
+/datum/sprite_accessory/body_markings/head/unathi/snout_lower_una_round
+	name = "Unathi Lower Round Snout"
+	icon_state = "lowersnout"
+	heads_allowed = list("All")
+
+/datum/sprite_accessory/body_markings/head/unathi/banded_una //Companion marking for Unathi Banded.
+	name = "Unathi Banded Head"
+	icon_state = "bandedface"
+	heads_allowed = list("All")
+
+/datum/sprite_accessory/body_markings/head/unathi/snout_narrow_una //Companion marking for Unathi Narrow Belly.
+	name = "Unathi Snout 2"
+	icon_state = "facenarrow"
+
+/datum/sprite_accessory/body_markings/head/unathi/points_una //Companion marking for Unathi Points.
+	name = "Unathi Points Head"
+	icon_state = "pointsface"
+
+/datum/sprite_accessory/body_markings/head/unathi/sharp
+	heads_allowed = list("Unathi Sharp Snout")
+
+/datum/sprite_accessory/body_markings/head/unathi/sharp/tiger_face_una_sharp
+	name = "Unathi Sharp Tiger Head and Face"
+	icon_state = "sharptiger"
+
+/datum/sprite_accessory/body_markings/head/unathi/sharp/snout_una_sharp
+	name = "Unathi Sharp Snout"
+	icon_state = "snoutsharp"
+
+/datum/sprite_accessory/body_markings/head/unathi/sharp/snout_narrow_una_sharp //Companion marking for Unathi Narrow Belly.
+	name = "Unathi Sharp Snout 2"
+	icon_state = "facesharp"
+
+/datum/sprite_accessory/body_markings/head/unathi/sharp/points_una_sharp //Companion marking for Unathi Points.
+	name = "Unathi Sharp Points Head"
+	icon_state = "pointsface"

code/modules/mob/new_player/sprite_accessories/vox/vox_body_markings.dm

@@ -0,0 +1,19 @@
+/datum/sprite_accessory/body_markings/tattoo/vox
+    icon = 'icons/mob/sprite_accessories/vox/vox_body_markings.dmi'
+    species_allowed = list("Vox")
+
+/datum/sprite_accessory/body_markings/tattoo/vox/heart_vox
+	name = "Vox Heart Tattoo"
+	icon_state = "heart"
+
+/datum/sprite_accessory/body_markings/tattoo/vox/hive_vox
+	name = "Vox Hive Tattoo"
+	icon_state = "hive"
+
+/datum/sprite_accessory/body_markings/tattoo/vox/nightling_vox
+	name = "Vox Nightling Tattoo"
+	icon_state = "nightling"
+
+/datum/sprite_accessory/body_markings/tattoo/vox/tiger_body_vox
+	name = "Vox Tiger-stripe Tattoo"
+	icon_state = "tiger"

code/modules/mob/new_player/sprite_accessories/vox/vox_facial_hair.dm

@@ -0,0 +1,20 @@
+/datum/sprite_accessory/facial_hair/vox
+    icon = 'icons/mob/sprite_accessories/vox/vox_facial_hair.dmi'
+    species_allowed = list("Vox")
+    gender = NEUTER
+
+/datum/sprite_accessory/facial_hair/vox/vox_colonel
+	name = "Vox Colonel Beard"
+	icon_state = "colonel"
+
+/datum/sprite_accessory/facial_hair/vox/vox_long
+	name = "Long Mustache"
+	icon_state = "fu"
+
+/datum/sprite_accessory/facial_hair/vox/vox_neck
+	name = "Neck Quills"
+	icon_state = "neck"
+
+/datum/sprite_accessory/facial_hair/vox/vox_beard
+	name = "Vox Quill Beard"
+	icon_state = "beard"

code/modules/mob/new_player/sprite_accessories/vox/vox_hair.dm

@@ -0,0 +1,60 @@
+/datum/sprite_accessory/hair/vox
+    icon = 'icons/mob/sprite_accessories/vox/vox_hair.dmi'
+    species_allowed = list("Vox")
+    glasses_over = 1
+
+/datum/sprite_accessory/hair/vox/vox_quills_short
+	name = "Short Vox Quills"
+	icon_state = "shortquills"
+
+/datum/sprite_accessory/hair/vox/vox_crestedquills
+	name = "Crested Vox Quills"
+	icon_state = "crestedquills"
+
+/datum/sprite_accessory/hair/vox/vox_tielquills
+	name = "Vox Tiel Quills"
+	icon_state = "tielquills"
+
+/datum/sprite_accessory/hair/vox/vox_emperorquills
+	name = "Vox Emperor Quills"
+	icon_state = "emperorquills"
+
+/datum/sprite_accessory/hair/vox/vox_keelquills
+	name = "Vox Keel Quills"
+	icon_state = "keelquills"
+
+/datum/sprite_accessory/hair/vox/vox_keetquills
+	name = "Vox Keet Quills"
+	icon_state = "keetquills"
+
+/datum/sprite_accessory/hair/vox/vox_quills_kingly
+	name = "Kingly Vox Quills"
+	icon_state = "kingly"
+
+/datum/sprite_accessory/hair/vox/vox_quills_fluff
+	name = "Fluffy Vox Quills"
+	icon_state = "afro"
+
+/datum/sprite_accessory/hair/vox/vox_quills_mohawk
+	name = "Vox Quill Mohawk"
+	icon_state = "mohawk"
+
+/datum/sprite_accessory/hair/vox/vox_quills_long
+	name = "Long Vox Quills"
+	icon_state = "yasu"
+
+/datum/sprite_accessory/hair/vox/vox_horns
+	name = "Vox Spikes"
+	icon_state = "horns"
+
+/datum/sprite_accessory/hair/vox/vox_nights
+	name = "Vox Pigtails"
+	icon_state = "nights"
+
+/datum/sprite_accessory/hair/vox/vox_razor
+	name = "Vox Razorback"
+	icon_state = "razor"
+
+/datum/sprite_accessory/hair/vox/vox_razor_clipped
+	name = "Clipped Vox Razorback"
+	icon_state = "razor_clipped"

code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm

@@ -0,0 +1,15 @@
+/datum/sprite_accessory/body_markings/tail/vox
+	icon = 'icons/mob/sprite_accessories/vox/vox_tail_markings.dmi'
+	species_allowed = list("Vox")
+
+/datum/sprite_accessory/body_markings/tail/vox/vox_band
+	name = "Vox Tail Band"
+	icon_state = "band"
+
+/datum/sprite_accessory/body_markings/tail/vox/vox_tip
+	name = "Vox Tail Tip"
+	icon_state = "tip"
+
+/datum/sprite_accessory/body_markings/tail/vox/vox_stripe
+	name = "Vox Tail Stripe"
+	icon_state = "stripe"

code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_body_markings.dm

@@ -0,0 +1,35 @@
+/datum/sprite_accessory/body_markings/vulpkanin
+    icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_body_markings.dmi'
+    species_allowed = list("Vulpkanin")
+
+/datum/sprite_accessory/body_markings/vulpkanin/belly_fox_vulp
+	name = "Vulpkanin Belly"
+	icon_state = "foxbelly"
+
+/datum/sprite_accessory/body_markings/vulpkanin/belly_full_vulp
+	name = "Vulpkanin Belly 2"
+	icon_state = "fullbelly"
+
+/datum/sprite_accessory/body_markings/vulpkanin/belly_crest_vulp
+	name = "Vulpkanin Belly Crest"
+	icon_state = "bellycrest"
+
+/datum/sprite_accessory/body_markings/vulpkanin/points_fade_vulp
+	name = "Vulpkanin Points"
+	icon_state = "pointsfade"
+
+/datum/sprite_accessory/body_markings/vulpkanin/points_fade_belly_vulp
+	name = "Vulpkanin Points and Belly"
+	icon_state = "pointsfadebelly"
+
+/datum/sprite_accessory/body_markings/vulpkanin/points_fade_belly_alt_vulp
+	name = "Vulpkanin Points and Belly Alt."
+	icon_state = "altpointsfadebelly"
+
+/datum/sprite_accessory/body_markings/vulpkanin/points_sharp_vulp
+	name = "Vulpkanin Sharp Points"
+	icon_state = "sharppoints"
+
+/datum/sprite_accessory/body_markings/vulpkanin/points_crest_vulp
+	name = "Vulpkanin Points and Crest"
+	icon_state = "crestpoints"

code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_facial_hair.dm

@@ -0,0 +1,49 @@
+/datum/sprite_accessory/facial_hair/vulpkanin
+	icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_facial_hair.dmi'
+	species_allowed = list("Vulpkanin")
+	gender = NEUTER
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_blaze
+	name = "Blaze"
+	icon_state = "blaze"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_vulpine
+	name = "Vulpine"
+	icon_state = "vulpine"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_vulpine_brows
+	name = "Vulpine and Brows"
+	icon_state = "brows"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_vulpine_fluff
+	name = "Vulpine and Earfluff"
+	icon_state = "vulpinefluff"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_mask
+	name = "Mask"
+	icon_state = "mask"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_patch
+	name = "Patch"
+	icon_state = "patch"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_ruff
+	name = "Ruff"
+	icon_state = "ruff"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_kita
+	name = "Kita"
+	icon_state = "kita"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_swift
+	name = "Swift"
+	icon_state = "swift"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_elder
+	name = "Elder"
+	icon_state = "elder"
+	secondary_theme = "chin"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_slash
+	name = "Slash"
+	icon_state = "slash"

code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_hair.dm

@@ -0,0 +1,87 @@
+/datum/sprite_accessory/hair/vulpkanin
+    icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_hair.dmi'
+    species_allowed = list("Vulpkanin")
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_kajam
+	name = "Kajam"
+	icon_state = "kajam"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_keid
+	name = "Keid"
+	icon_state = "keid"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_adhara
+	name = "Adhara"
+	icon_state = "adhara"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_kleeia
+	name = "Kleeia"
+	icon_state = "kleeia"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_mizar
+	name = "Mizar"
+	icon_state = "mizar"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_apollo
+	name = "Apollo"
+	icon_state = "apollo"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_belle
+	name = "Belle"
+	icon_state = "belle"
+	secondary_theme = "bands"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_bun
+	name = "Bun"
+	icon_state = "bun"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_jagged
+	name = "Jagged"
+	icon_state = "jagged"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_curl
+	name = "Curl"
+	icon_state = "curl"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_hawk
+	name = "Hawk"
+	icon_state = "hawk"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_anita
+	name = "Anita"
+	icon_state = "anita"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_short
+	name = "Short"
+	icon_state = "short"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_spike
+	name = "Spike"
+	icon_state = "spike"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_braided
+	name = "Braided"
+	icon_state = "braided"
+	secondary_theme = "beads"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_punkbraided
+	name = "Punk Braided"
+	icon_state = "punkbraided"
+	secondary_theme = "flare"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_short2
+	name = "Short Alt."
+	icon_state = "short2"
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_rough
+	name = "Rough-Cropped Mane"
+	icon_state = "rough"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_raine
+	name = "Raine"
+	icon_state = "raine"
+	gender = FEMALE

code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_accessories.dm

@@ -0,0 +1,57 @@
+/datum/sprite_accessory/head_accessory/vulpkanin
+    icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_facial_hair.dmi'
+    species_allowed = list("Vulpkanin")
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_earfluff
+	name = "Vulpkanin Earfluff"
+	icon_state = "earfluff"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_blaze
+	name = "Blaze"
+	icon_state = "blaze"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_vulpine
+	name = "Vulpine"
+	icon_state = "vulpine"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_vulpine_fluff
+	name = "Vulpine and Earfluff"
+	icon_state = "vulpinefluff"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_mask
+	name = "Mask"
+	icon_state = "mask"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_patch
+	name = "Patch"
+	icon_state = "patch"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_ruff
+	name = "Ruff"
+	icon_state = "ruff"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_kita
+	name = "Kita"
+	icon_state = "kita"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_swift
+	name = "Swift"
+	icon_state = "swift"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_nose
+    icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_head_markings.dmi'
+    name = "Vulpkanin Nose"
+    icon_state = "nose"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_nose2
+    icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_head_markings.dmi'
+    name = "Vulpkanin Nose Alt."
+    icon_state = "nose_alt"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_elder
+	name = "Elder"
+	icon_state = "elder"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_slash
+	name = "Slash"
+	icon_state = "slash"

code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm

@@ -0,0 +1,35 @@
+/datum/sprite_accessory/body_markings/head/vulpkanin
+    icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_head_markings.dmi'
+    species_allowed = list("Vulpkanin")
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/nose_default_vulp
+	name = "Vulpkanin Nose"
+	icon_state = "nose"
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/nose2_default_vulp
+	name = "Vulpkanin Nose Alt."
+	icon_state = "nose_alt"
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/tiger_head_vulp
+	name = "Vulpkanin Tiger Head"
+	icon_state = "tiger_head"
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/tiger_face_vulp
+	name = "Vulpkanin Tiger Head and Face"
+	icon_state = "tiger_face"
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_vulp //Companion marking for Vulpkanin Belly Alt..
+	name = "Vulpkanin Muzzle"
+	icon_state = "muzzle"
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_ears_vulp //Companion marking for Vulpkanin Belly Alt..
+	name = "Vulpkanin Muzzle and Ears"
+	icon_state = "muzzle_ear"
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/points_fade_vulp //Companion marking for Vulpkanin Points Fade.
+	name = "Vulpkanin Points Head"
+	icon_state = "points_fade"
+
+/datum/sprite_accessory/body_markings/head/vulpkanin/points_sharp_vulp //Companion marking for Vulpkanin Points Sharp.
+	name = "Vulpkanin Points Head 2"
+	icon_state = "points_sharp"

code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm

@@ -0,0 +1,36 @@
+/datum/sprite_accessory/body_markings/tail/vulpkanin
+    icon = 'icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi'
+    species_allowed = list("Vulpkanin")
+
+/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_default_tip
+	name = "Vulpkanin Default Tail Tip"
+	icon_state = "default_tip"
+
+/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_default_fade
+	name = "Vulpkanin Default Tail Fade"
+	icon_state = "default_fade"
+
+/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_bushy_fluff
+	name = "Vulpkanin Bushy Tail Fluff"
+	tails_allowed = list("Vulpkanin Alt 1 (Bushy)")
+	icon_state = "bushfluff"
+
+/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_short_tip
+	name = "Vulpkanin Short Tail Tip"
+	tails_allowed = list("Vulpkanin Alt 4 (Short)")
+	icon_state = "short"
+
+/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_tip
+	name = "Vulpkanin Bushy Straight Tail Tip"
+	tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)")
+	icon_state = "sbtip"
+
+/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_fade
+	name = "Vulpkanin Bushy Straight Tail Fade"
+	tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)")
+	icon_state = "sbfade"
+
+/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_silverf
+	name = "Vulpkanin Bushy Straight Tail Black Fade White Tip"
+	tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)")
+	icon_state = "sbsilverfade"

code/modules/mob/new_player/sprite_accessories/wryn/wryn_face.dm

@@ -0,0 +1,8 @@
+/datum/sprite_accessory/hair/wryn
+	icon = 'icons/mob/sprite_accessories/wryn/wryn_face.dmi'
+	species_allowed = list("Wryn")
+	glasses_over = 1
+
+/datum/sprite_accessory/hair/wryn/wry_antennae_default
+	name = "Antennae"
+	icon_state = "antennae"

code/modules/mob/status_procs.dm

@@ -52,23 +52,13 @@
 	return
 
 
-/mob/proc/EarDamage()
-	return
-
-/mob/proc/SetEarDamage()
+/mob/proc/RestoreEars()
 	return
 
 /mob/proc/AdjustEarDamage()
 	return
 
-
-/mob/proc/EarDeaf()
-	return
-
-/mob/proc/SetEarDeaf()
-	return
-
-/mob/proc/AdjustEarDeaf()
+/mob/proc/MinimumDeafTicks()
 	return
 
 

code/modules/mob/update_status.dm

@@ -35,7 +35,7 @@
 // Procs that give information about the status of the mob
 
 /mob/proc/can_hear()
-	return 1
+	. = 1
 
 /mob/proc/has_vision(information_only = FALSE)
 	return 1