Skip to content

Commit

Permalink
Merge pull request #9170 from MistakeNot4892/hairports
Browse files Browse the repository at this point in the history
Ports several Unathi and Skrell hair from Neb and Bay
  • Loading branch information
Atermonera authored Aug 5, 2023
2 parents 4d1c709 + 8d6f448 commit 0c3f01c
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 18 deletions.
103 changes: 85 additions & 18 deletions code/modules/mob/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1219,20 +1219,6 @@
icon_state = "hair_ziegler"
flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/una_hood
name = "Cobra Hood"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "soghun_hood"
species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)

/datum/sprite_accessory/hair/una_doublehorns
name = "Double Unathi Horns"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "soghun_dubhorns"
species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)

/datum/sprite_accessory/hair/sergal_plain
name = "Sergal Plain"
icon = 'icons/mob/human_face_alt.dmi'
Expand Down Expand Up @@ -1688,9 +1674,83 @@ shaved
//Unathi Head-Bits

/datum/sprite_accessory/hair/una
name = "Long Unathi Spines"
icon_state = "soghun_longspines"
name = "Long Unathi Spines"
icon_state = "soghun_longspines"
species_allowed = list(SPECIES_UNATHI)
icon = 'icons/mob/hair_unathi.dmi'
icon_add = 'icons/mob/hair_unathi_add.dmi'

/datum/sprite_accessory/hair/una/finhawk
name = "Unathi Finhawk"
icon_state = "fin_hawk"

/datum/sprite_accessory/hair/una/downcurve_horns
name = "Downward-Curved Unathi Horns"
icon_state = "curved_down"

/datum/sprite_accessory/hair/una/upcurve_horns
name = "Upward-Curved Unathi Horns"
icon_state = "curved_up"

/datum/sprite_accessory/hair/una/samurai_horns
name = "Unathi Samurai Horns"
icon_state = "samurai"

/datum/sprite_accessory/hair/una/big_frills
name = "Big Unathi Frills"
icon_state = "big_frills"

/datum/sprite_accessory/hair/una/head_spikes
name = "Unathi Head Spikes"
icon_state = "head_spikes"

/datum/sprite_accessory/hair/una/overgrown_spikes
name = "Overgrown Unathi Head Spikes"
icon_state = "overgrown_head_spikes"

/datum/sprite_accessory/hair/una/cobrahood
name = "Unathi Cobra Hood"
icon_state = "unathi_cobrahood"

/datum/sprite_accessory/hair/una/demon_horns
name = "Unathi Demon Horns"
icon_state = "unathi_horns_demon"

/datum/sprite_accessory/hair/una/large_ram_horns
name = "Large Unathi Ram Horns"
icon_state = "unathi_horns_ram_big"

/datum/sprite_accessory/hair/una/aqua_frills
name = "Unathi Aqua Frills"
icon_state = "unathi_frills_aqua"

/datum/sprite_accessory/hair/una/curled_horns
name = "Curled Unathi Horns"
icon_state = "unathi_horns_curled"

/datum/sprite_accessory/hair/una/ram_horns
name = "Unathi Ram Horns"
icon_state = "unathi_horns_ram"

/datum/sprite_accessory/hair/una/thick_ram_horns
name = "Thick Unathi Ram Horns"
icon_state = "unathi_horns_ram_thick"

/datum/sprite_accessory/hair/una/double_horns
name = "Double Unathi Horns"
icon_state = "unathi_horns_double"

/datum/sprite_accessory/hair/una/swept_horns
name = "Swept Unathi Horns"
icon_state = "unathi_horns_swept"

/datum/sprite_accessory/hair/una/short_spined_frills
name = "Short Spined Unathi Frills"
icon_state = "unathi_spined_short_frills"

/datum/sprite_accessory/hair/una/long_spined_frills
name = "Long Spined Unathi Frills"
icon_state = "unathi_spined_long_frills"

/datum/sprite_accessory/hair/una/spines_short
name = "Short Unathi Spines"
Expand Down Expand Up @@ -1726,9 +1786,11 @@ shaved
//Skrell 'hairstyles'

/datum/sprite_accessory/hair/skr
name = "Tentacles, Average"
icon_state = "skrell_short"
name = "Tentacles, Average"
icon_state = "skrell_short"
species_allowed = list(SPECIES_SKRELL, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
icon = 'icons/mob/hair_skrell.dmi'
icon_add = 'icons/mob/hair_skrell_add.dmi'

/datum/sprite_accessory/hair/skr/pullback
name = "Tentacles, Average, Pullback"
Expand Down Expand Up @@ -1770,6 +1832,11 @@ shaved
name = "Tentacles, Very Long, Wavy"
icon_state = "skrell_very_long_wavy"

/datum/sprite_accessory/hair/skr/split
name = "Tentacles, Split"
icon_state = "skrell_split"


//Tajaran hairstyles
/datum/sprite_accessory/hair/taj
name = "Tajaran Ears"
Expand Down
Binary file added icons/mob/hair_skrell.dmi
Binary file not shown.
Binary file added icons/mob/hair_skrell_add.dmi
Binary file not shown.
Binary file added icons/mob/hair_unathi.dmi
Binary file not shown.
Binary file added icons/mob/hair_unathi_add.dmi
Binary file not shown.
Binary file modified icons/mob/human_face.dmi
Binary file not shown.
Binary file modified icons/mob/human_face_alt.dmi
Binary file not shown.
Binary file modified icons/mob/human_face_alt_add.dmi
Binary file not shown.
Binary file modified icons/mob/human_face_m.dmi
Binary file not shown.

0 comments on commit 0c3f01c

Please sign in to comment.