morefeedback

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, hair_styles_fluff_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/hair, hair_styles_list, hair_styles_male_list, hair_styles_female_list, hair_styles_full_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

code/_globalvars/lists/flavor_misc.dm

@@ -7,7 +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/hair_styles_full_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()

code/modules/customitems/item_defines.dm

@@ -1048,7 +1048,7 @@
 	if(!istype(target) || target.get_species() != "Skrell") // It'd be strange to see other races with head tendrils.
 		return
 
-	if(target.change_hair("Zeke's Tentacles"))
+	if(target.change_hair("Zekes Tentacles", 1))
 		to_chat(target, "<span class='notice'>You take time to admire yourself in [src], brushing your tendrils down and revealing their true length.</span>")
 
 

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

@@ -35,9 +35,12 @@
 	update_body()
 	return 1
 
-/mob/living/carbon/human/proc/change_hair(var/hair_style)
+/mob/living/carbon/human/proc/change_hair(var/hair_style, var/fluff)
 	var/obj/item/organ/external/head/H = get_organ("head")
-	if(!hair_style || !H || H.h_style == hair_style || !(hair_style in hair_styles_list))
+
+	if(!hair_style || !H || H.h_style == hair_style)
+		return
+	if(!(fluff || (hair_style in hair_styles_list)))
 		return
 
 	H.h_style = hair_style

code/modules/mob/new_player/sprite_accessories.dm

@@ -17,20 +17,21 @@
 	conversion in savefile.dm
 */
 
-/proc/init_sprite_accessory_subtypes(var/prototype, var/list/L, var/list/male, var/list/female, var/list/fluff)
+/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(fluff))	fluff = 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)
-				fluff[D.name] = D
+				full_list[D.name] = D
 			else
 				L[D.name] = D
+				full_list[D.name] = D
 
 			switch(D.gender)
 				if(MALE)	male[D.name] = D
@@ -54,7 +55,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
+	var/fluff = 0
 	// Whether or not the accessory can be affected by colouration
 	var/do_colouration = 1
 
@@ -935,12 +936,12 @@
 
 
 /datum/sprite_accessory/hair/fluff
-	fluff = 1
 
 /datum/sprite_accessory/hair/fluff/zeke_fluff_tentacle //Zeke Fluff hair
-	name = "Zeke's Tentacles"
+	name = "Zekes Tentacles"
 	icon_state = "zeke_fluff_hair"
 	species_allowed = list("Skrell")
+	fluff = 1
 
 /*
 ///////////////////////////////////