From f2f68bdef923d045e210cc0a33e1fe4569ad4cd9 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Thu, 22 Jun 2017 00:35:19 -0400
Subject: [PATCH] Commit for Peer Review

---
 code/__HELPERS/global_lists.dm                    |  2 +-
 code/_globalvars/lists/flavor_misc.dm             |  1 +
 code/modules/mob/new_player/sprite_accessories.dm | 14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index c8d4fd2c659..228308fed89 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -9,7 +9,7 @@
 	//head accessory
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/head_accessory, head_accessory_styles_list)
 	//hair
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/hair, hair_styles_list, hair_styles_male_list, hair_styles_female_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/hair, hair_styles_list, hair_styles_male_list, hair_styles_female_list, hair_styles_fluff_list)
 	//facial hair
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, facial_hair_styles_list, facial_hair_styles_male_list, facial_hair_styles_female_list)
 	//underwear
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 4639f5d93cf..3fa9f20a8c2 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -7,6 +7,7 @@ var/global/list/marking_styles_list = list() //stores /datum/sprite_accessory/bo
 var/global/list/hair_styles_list = list()			//stores /datum/sprite_accessory/hair indexed by name
 var/global/list/hair_styles_male_list = list()
 var/global/list/hair_styles_female_list = list()
+var/global/list/hair_styles_fluff_list = list() //fluff hair styles
 var/global/list/facial_hair_styles_list = list()	//stores /datum/sprite_accessory/facial_hair indexed by name
 var/global/list/facial_hair_styles_male_list = list()
 var/global/list/facial_hair_styles_female_list = list()
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 5b10e46b676..34fa04282e3 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -17,16 +17,20 @@
 	conversion in savefile.dm
 */
 
-/proc/init_sprite_accessory_subtypes(var/prototype, var/list/L, var/list/male, var/list/female)
+/proc/init_sprite_accessory_subtypes(var/prototype, var/list/L, var/list/male, var/list/female, var/list/fluff)
 	if(!istype(L))	L = list()
 	if(!istype(male))	male = list()
 	if(!istype(female))	female = list()
+	if(!istype(fluff))	fluff = list()
 
 	for(var/path in subtypesof(prototype))
 		var/datum/sprite_accessory/D = new path()
 
 		if(D.name)
-			L[D.name] = D
+			if(D.fluff)
+				fluff[D.name] = D
+			else
+				L[D.name] = D
 
 			switch(D.gender)
 				if(MALE)	male[D.name] = D
@@ -50,7 +54,7 @@
 	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
 	// Whether or not the accessory can be affected by colouration
 	var/do_colouration = 1
 
@@ -65,7 +69,7 @@
 
 /datum/sprite_accessory/hair
 	icon = 'icons/mob/human_face.dmi'	  // default icon for all hairs
-	var/glasses_over //Hair styles with hair that don't overhang the arms of glasses should have glasses_over set to a positive value.
+	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
 	name = "Bald"
@@ -931,7 +935,7 @@
 
 
 /datum/sprite_accessory/hair/fluff
-	glasses_over = 1
+	fluff = 1
 
 /datum/sprite_accessory/hair/fluff/zeke_fluff_tentacle //Zeke Fluff hair
 	name = "Zeke's Tentacles"