Merge Fix

code/modules/mob/new_player/sprite_accessories.dm

@@ -1307,6 +1307,11 @@
 	name = "Rough-Cropped Mane"
 	icon_state = "rough"
 
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_raine
+	name = "Raine"
+	icon_state = "vulp_hair_raine"
+	gender = FEMALE
+
 /datum/sprite_accessory/hair/vox
 	species_allowed = list("Vox")
 	glasses_over = 1
@@ -1425,6 +1430,42 @@
 	name = "Wildflowers"
 	icon_state = "diona_wildflower"
 
+//Kidan Hairstyles, sprites by Travelling Merchant
+
+/datum/sprite_accessory/hair/kidan
+	species_allowed = list("Kidan")
+	glasses_over = 1
+	do_colouration = 0
+
+/datum/sprite_accessory/hair/kidan/hollow_horns
+	name = "Hollow Horns"
+	icon_state = "kidan_hollow_horns"
+
+/datum/sprite_accessory/hair/kidan/wide_horns
+	name = "Wide Horns"
+	icon_state = "kidan_wide_horns"
+
+/datum/sprite_accessory/hair/kidan/curled_horns
+	name = "Curled Horns"
+	icon_state = "kidan_curled_horns"
+
+/datum/sprite_accessory/hair/kidan/hawk_horn
+	name = "Hawk Horn"
+	icon_state = "kidan_hawk_horn"
+
+/datum/sprite_accessory/hair/kidan/kidan_bull_horns
+	name = "Bull Horns"
+	icon_state = "kidan_bull_horns"
+
+/datum/sprite_accessory/hair/kidan/kidan_broken_bull_horns
+	name = "Broken Bull Horns"
+	icon_state = "kidan_broken_bull_horns"
+
+/datum/sprite_accessory/hair/kidan/kidan_tall_horns
+	name = "Tall Horns"
+	icon_state = "kidan_tall_horns"
+
+
 // Apollo-specific
 
 /datum/sprite_accessory/hair/wryn
@@ -2532,6 +2573,17 @@
 	name = "Moth Antennae"
 	icon_state = "kidan_moth"
 
+/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Long
+	name = "Mantie Long"
+	icon_state = "kidan_Mantie_Long"
+
+/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Curled
+	name = "Mantie Curled"
+	icon_state = "kidan_Mantie_Curled"
+
+/datum/sprite_accessory/head_accessory/kidan/kidan_very_short
+	name = "Very Short"
+	icon_state = "kidan_very_short"
 
 /* BODY MARKINGS */