Skip to content

Commit

Permalink
Merge pull request #218 from SynthTwo/cute-hairs
Browse files Browse the repository at this point in the history
Ports cute hairs from Bubber
  • Loading branch information
SynthTwo authored Feb 1, 2025
2 parents 3970efd + 4746d73 commit 527355c
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 30 deletions.
85 changes: 55 additions & 30 deletions modular_iris/code/modules/mob/dead/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,166 +2,191 @@
/datum/sprite_accessory/hair/hyenamane
name = "Hyena Mane"
icon_state = "hair_hyenamane"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'

/datum/sprite_accessory/hair/tailhair
name = "Tail Hair"
icon_state = "hair_tailhair"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'

/datum/sprite_accessory/hair/hairfre
name = "Hairfre"
icon_state = "hair_hairfre"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'

/datum/sprite_accessory/hair/sidehair
name = "Side Hair"
icon_state = "hair_tailhair2"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'

/datum/sprite_accessory/hair/curtains
name = "Curtains"
icon_state = "hair_curtains"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'

/datum/sprite_accessory/hair/aviancrest
name = "Avian Crest"
icon_state = "hair_aviancrest"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'

/datum/sprite_accessory/hair/glamour
name = "Glamour"
icon_state = "hair_glamourh"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'

//Podpeople hair
/datum/sprite_accessory/hair/podmale
name = "Pod Male"
icon_state = "pod_hair_m"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/podfemale
name = "Pod Female"
icon_state = "pod_hair_f"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/ivy
name = "Ivy"
icon_state = "pod_hair_ivy"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/cabbage
name = "Cabbage"
icon_state = "pod_hair_cabbage"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/spinach
name = "Spinach"
icon_state = "pod_hair_spinach"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/prayer
name = "Prayer"
icon_state = "pod_hair_prayer"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/vine
name = "Vine"
icon_state = "pod_hair_vine"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/shrub
name = "Shrub"
icon_state = "pod_hair_shrub"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/rose
name = "Rose"
icon_state = "pod_hair_rose"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/orchid
name = "Orchid"
icon_state = "pod_hair_orchid"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/fig
name = "Fig"
icon_state = "pod_hair_fig"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/hibiscus
name = "Hibiscus"
icon_state = "pod_hair_hibiscus"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)

/datum/sprite_accessory/hair/emma
name = "Emma"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_emma"

/datum/sprite_accessory/hair/immovable
name = "Ozen"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_immovable"

/datum/sprite_accessory/hair/damsel
name = "Damsel"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_damsel"

/datum/sprite_accessory/hair/wavylong
name = "Long Wavy"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_wavylong"

/datum/sprite_accessory/hair/wavyovereye
name = "Wavy over eye"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_wavyovereye"

/datum/sprite_accessory/hair/straightovereye
name = "Straight over eye"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_straightovereye"

/datum/sprite_accessory/hair/straightside
name = "Side Straight"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_straightside"

/datum/sprite_accessory/hair/straightshort
name = "Straight Long"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_straightshort"

/datum/sprite_accessory/hair/straightlong
name = "Straight Long"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_straightlong"

/datum/sprite_accessory/hair/straightfloorlength
name = "Straight Long (Very)"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_straightfloorlength"

/datum/sprite_accessory/hair/deathhawk
name = "Deathhawk"
icon = 'modular_iris/icons/mob/species/human/humanface.dmi'
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_deathhawk"

/datum/sprite_accessory/hair/wicked // bubber port
name = "Wicked"
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_wicked"

/datum/sprite_accessory/hair/short_bob //cepha - bubber port start
name = "Short Bob"
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_short_bob"

/datum/sprite_accessory/hair/long_smoothy
name = "Long Smoothy"
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_long_smoothy"

/datum/sprite_accessory/hair/tails_berly
name = "Ponytails (Berly)"
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_tails_berly"

/datum/sprite_accessory/hair/short_side //cepha - bubber port end
name = "Short (Side)"
icon = 'modular_iris/icons/mob/species/human/hair.dmi'
icon_state = "hair_short_side"

//teshari
/datum/sprite_accessory/tails/mammal/teshari/damaged
name = "Teshari (Damaged)"
Expand Down
Binary file added modular_iris/icons/mob/species/human/hair.dmi
Binary file not shown.
Binary file removed modular_iris/icons/mob/species/human/humanface.dmi
Binary file not shown.

0 comments on commit 527355c

Please sign in to comment.