Merge pull request #247 from Nerev4r/didthebarbermessupmylineup

Adds More Hair & More Horns

modular_doppler/modular_customization/accessories/code/hair.dm

@@ -655,6 +655,50 @@
 	name = "Inari"
 	icon_state = "inari"
 
+/datum/sprite_accessory/hair/modular/punktails
+    name = "Punktails"
+    icon_state = "hair_punktails"
+
+/datum/sprite_accessory/hair/modular/firestarter
+    name = "Firestarter"
+    icon_state = "hair_firestarter"
+
+/datum/sprite_accessory/hair/modular/impish
+    name = "Impish"
+    icon_state = "hair_impish"
+
+/datum/sprite_accessory/hair/modular/mermaid
+    name = "Mermaid"
+    icon_state = "hair_mermaid"
+
+/datum/sprite_accessory/hair/modular/royal_curls
+    name = "Royal Curls"
+    icon_state = "hair_royal_curls"
+
+/datum/sprite_accessory/hair/modular/halfcut
+    name = "Halfcut"
+    icon_state = "hair_halfcut"
+
+/datum/sprite_accessory/hair/modular/halfcut_rough
+    name = "Halfcut Rough"
+    icon_state = "hair_halfcut_rough"
+
+/datum/sprite_accessory/hair/modular/glossy
+    name = "Glossy"
+    icon_state = "hair_glossy"
+
+/datum/sprite_accessory/hair/modular/mia
+    name = "Mia"
+    icon_state = "hair_mia"
+
+/datum/sprite_accessory/hair/modular/braided_sidetail
+    name = "Braided Sidetail"
+    icon_state = "hair_braided_sidetail"
+
+/datum/sprite_accessory/hair/modular/glamour
+    name = "Glamour"
+    icon_state = "hair_glamour"
+
 // Facial hair
 
 /datum/sprite_accessory/facial_hair/modular

modular_doppler/modular_customization/accessories/code/human_accessories/human_horns.dm

@@ -42,3 +42,56 @@
 /datum/sprite_accessory/horns/humanoid/broken_l
 	name = "Broken (Left)"
 	icon_state = "lbroken"
+
+/datum/sprite_accessory/horns/humanoid/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+
+/datum/sprite_accessory/horns/humanoid/drake
+	name = "Drake"
+	icon_state = "drake"
+
+/datum/sprite_accessory/horns/humanoid/crippledbull
+	name = "Crippled Bull"
+	icon_state = "crippledbull"
+
+/datum/sprite_accessory/horns/humanoid/ticketrack
+	name = "Ticket Rack"
+	icon_state = "ticketrack"
+
+/datum/sprite_accessory/horns/humanoid/hopefulhorns
+	name = "Hopeful Horns"
+	icon_state = "hopefulhorns"
+
+/datum/sprite_accessory/horns/humanoid/broadcurls
+	name = "Broad Curls"
+	icon_state = "broadcurls"
+
+/datum/sprite_accessory/horns/humanoid/curly
+	name = "Curly"
+	icon_state = "newcurly"
+
+/datum/sprite_accessory/horns/humanoid/upwards
+	name = "Upwards"
+	icon_state = "upwardshorns"
+
+/datum/sprite_accessory/horns/humanoid/dragon
+	name = "Dragon"
+	icon_state = "dragon"
+
+/datum/sprite_accessory/horns/humanoid/antenna
+	name = "Antenna"
+	icon_state = "antenna"
+
+/datum/sprite_accessory/horns/humanoid/big
+	name = "Painted Points"
+	icon = 'modular_doppler/modular_customization/accessories/icons/human/horns_big.dmi'
+	icon_state = "paintedpoints"
+
+/datum/sprite_accessory/horns/humanoid/big/whoshorns
+	name = "Who's Horns"
+	icon_state = "whoshorns"
+
+/datum/sprite_accessory/horns/humanoid/big/highrisehorns
+	name = "High-rise Horns"
+	icon_state = "highrisehorns"