diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 83f9e6a8824..d06d09460a2 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -2236,12 +2236,6 @@ Follow by example and make good judgement based on length which list to include length = 5 chatname = "horns" -/datum/sprite_accessory/hair/una_aquaticfrill/una_elvis - name = "Elvis Sideburns" - icon_state = "unathi_elvis" - length = 0 - chatname = "sideburns" - /datum/sprite_accessory/hair/una_aquaticfrill/una_hornadorns name = "Unathi Horn Adorns" icon_state = "unathi_hornadorns" @@ -2500,6 +2494,50 @@ Follow by example and make good judgement based on length which list to include length = 2 chatname = "horn stub" +/datum/sprite_accessory/hair/una_aquaticfrill/finhawk + name = "Unathi Mohawk Fin" + icon_state = "fin_hawk" + length = 0 + chatname = "fin" + +/datum/sprite_accessory/hair/una_aquaticfrill/big + name = "Unathi Big Frills" + icon_state = "big_frills" + length = 0 + chatname = "frills" + +/datum/sprite_accessory/hair/una_aquaticfrill/quintuple + name = "Unathi Quintuple Horns" + icon_state = "quintuple_horns" + length = 5 + chatname = "horns" + +/datum/sprite_accessory/hair/una_aquaticfrill/curved + name = "Unathi Curved-Up Horns" + icon_state = "curved_up" + length = 5 + chatname = "horns" + +/datum/sprite_accessory/hair/una_aquaticfrill/curved/down + name = "Unathi Curved-Down Horns" + icon_state = "curved_down" + +/datum/sprite_accessory/hair/una_aquaticfrill/samurai + name = "Unathi Samurai Horns" + icon_state = "samurai" + length = 5 + chatname = "horns" + +/datum/sprite_accessory/hair/una_aquaticfrill/headspikes + name = "Unathi Head Spikes" + icon_state = "head_spikes" + length = 5 + chatname = "spiked horns" + +/datum/sprite_accessory/hair/una_aquaticfrill/headspikes/overgrown + name = "Unathi Overgrown Head Spikes" + icon_state = "overgrown_head_spikes" + //skrell tentacles /datum/sprite_accessory/hair/skr_tentacle_damaged_long_r @@ -3904,22 +3942,6 @@ Follow by example and make good judgement based on length which list to include name = "Unathi Big Horns" icon_state = "facial_bighorn" -/datum/sprite_accessory/facial_hair/una_aquaticfrill/una_bob - name = "Bob" - icon_state = "facial_bob" - -/datum/sprite_accessory/facial_hair/una_aquaticfrill/una_bobcurl - name = "Bobcurl" - icon_state = "facial_bobcurl" - -/datum/sprite_accessory/facial_hair/una_aquaticfrill/una_buzzcut - name = "Buzzcut" - icon_state = "facial_buzzcut" - -/datum/sprite_accessory/facial_hair/una_aquaticfrill/una_buzzcut2 - name = "Buzzcut 2" - icon_state = "facial_buzzcut2" - /datum/sprite_accessory/facial_hair/una_aquaticfrill/una_chinhorn name = "Unathi Chin Horn" icon_state = "facial_chinhorns" @@ -3996,10 +4018,6 @@ Follow by example and make good judgement based on length which list to include name = "Unathi Side Frills" icon_state = "facial_sidefrills" -/datum/sprite_accessory/facial_hair/una_aquaticfrill/una_spiky - name = "Spiky" - icon_state = "facial_spiky" - /datum/sprite_accessory/facial_hair/una_aquaticfrill/una_horns name = "Unathi Horns" icon_state = "facial_simplehorn" diff --git a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm index b89e0ed4a50..944f2c606c8 100644 --- a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm @@ -13,7 +13,7 @@ bandages_icon = 'icons/mob/bandage.dmi' tail = "Tail" tail_animation = 'icons/mob/species/unathi/tail.dmi' - selectable_tails = list("Tail") + selectable_tails = list("Tail", "Damaged Tail", "Stubby Tail") unarmed_types = list( /datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, diff --git a/html/changelogs/unathiports.yml b/html/changelogs/unathiports.yml new file mode 100644 index 00000000000..9ede0d66b4d --- /dev/null +++ b/html/changelogs/unathiports.yml @@ -0,0 +1,9 @@ +# Your name. +author: Pirouette + +delete-after: True + +changes: + - imageadd: "Ported some new Unathi hairstyles from Baystation 12, Polaris, and Vorestation." + - imageadd: "Ported damaged and stubby Unathi tails from Polaris." + - imagedel: "Removed human hairstyles from Unathi." diff --git a/icons/mob/human_face/unathi_hair.dmi b/icons/mob/human_face/unathi_hair.dmi index adab265d7c6..c3772aaa40d 100644 Binary files a/icons/mob/human_face/unathi_hair.dmi and b/icons/mob/human_face/unathi_hair.dmi differ diff --git a/icons/mob/species/unathi/tail.dmi b/icons/mob/species/unathi/tail.dmi index c5a0c608662..f621a8e8734 100644 Binary files a/icons/mob/species/unathi/tail.dmi and b/icons/mob/species/unathi/tail.dmi differ