Merge branch 'master' into Refactors-beds-stools-chairs

code/modules/mob/new_player/new_player.dm

@@ -316,12 +316,10 @@
 	job_master.AssignRole(src, rank, 1)
 
 	var/mob/living/character = create_character()	//creates the human and transfers vars and mind
-	character = job_master.EquipRank(character, rank, 1)					//equips the human
-	EquipCustomItems(character)
+	character = job_master.AssignRank(character, rank, 1)					//equips the human
 
 	// AIs don't need a spawnpoint, they must spawn at an empty core
 	if(character.mind.assigned_role == "AI")
-
 		var/mob/living/silicon/ai/ai_character = character.AIize() // AIize the character, but don't move them yet
 
 		// IsJobAvailable for AI checks that there is an empty core available in this list
@@ -365,6 +363,9 @@
 
 	ticker.mode.latespawn(character)
 
+	character = job_master.EquipRank(character, rank, 1)					//equips the human
+	EquipCustomItems(character)
+
 	if(character.mind.assigned_role == "Cyborg")
 		AnnounceCyborg(character, rank, join_message)
 		callHook("latespawn", list(character))

code/modules/mob/new_player/sprite_accessories.dm

@@ -890,6 +890,21 @@
 	icon_state = "hesphiastos_alt_rainbow"
 	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"
+
 /*
 ///////////////////////////////////
 /  =---------------------------=  /