Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

add a bunch of hair pieces #18328

Merged
merged 3 commits into from Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 56 additions & 0 deletions code/datums/customization_styles.dm
Expand Up @@ -196,6 +196,10 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
flick_fade
name = "Flick: Faded"
id = "flick_fade"
flick_half
name = "Flick: Split"
id = "flick_half"
random_allowed = FALSE
floof
name = "Floof"
id = "floof"
Expand Down Expand Up @@ -289,12 +293,24 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
combedfront
name = "Combed Front"
id = "combedfront"
combedfrontbangs
name = "Bangs: Combed Front"
id = "combedfrontbangs"
random_allowed = FALSE
combedfrontshort
name = "Combed Front Short"
id = "combedfrontshort"
combedfrontshortbangs
name = "Bangs: Combed Front Short"
id = "combedfrontshortbangs"
random_allowed = FALSE
longfront
name = "Long Front"
id = "longfront"
longfrontbangs
name = "Bangs: Long Front"
id = "longfrontbangs"
random_allowed = FALSE
salty
name = "Salty"
id = "salty"
Expand Down Expand Up @@ -328,9 +344,17 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
spoon
name = "Spoon"
id = "spoon"
spoonbangs
name = "Bangs: Spoon"
id = "spoonbangs"
random_allowed = FALSE
messy_waves
name = "Messy Waves"
id = "messy_waves"
messy_waves_half
name = "Messy Waves: Split"
id = "messy_waves_half"
random_allowed = FALSE
blunt_bob
name = "Blunt Bob"
id = "blunt_bob"
Expand Down Expand Up @@ -484,6 +508,10 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
longwaves_fade
name = "Waves: Faded"
id = "longwaves_fade"
longwaves_half
name = "Waves: Split"
id = "longwaves_half"
random_allowed = FALSE
pulledb
name = "Pulled Back"
id = "pulledb"
Expand Down Expand Up @@ -522,6 +550,10 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
smoothwave_fade
name = "Smooth Waves: Faded"
id = "smoothwave_fade"
smoothwave_half
name = "Smooth Waves: Split"
id = "smoothwave_half"
random_allowed = FALSE
mermaid
name = "Mermaid"
id = "mermaid"
Expand All @@ -548,6 +580,10 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
violet_fade
name = "Violet: Faded"
id = "violet_fade"
violet_half
name = "Violet: Split"
id = "violet_half"
random_allowed = FALSE
willow
name = "Willow"
id = "willow"
Expand Down Expand Up @@ -603,16 +639,28 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
name = "Long Twin Tails"
id = "longtwintail"
gender = FEMININE
longtwintail_half
name = "Long Twin Tails: Split"
id = "longtwintail_half"
random_allowed = FALSE
glamponytail
name = "Glam Ponytail"
id = "glamponytail"
glamponytail_half
name = "Glam Ponytail: Split"
id = "glamponytail_half"
random_allowed = FALSE
rockponytail
name = "Rock Ponytail"
id = "rockponytail"
gender = FEMININE
rockponytail_fade
name = "Rock Ponytail: Faded"
id = "rockponytail_fade"
rockponytail_half
name = "Rock Ponytail: Split"
id = "rockponytail_half"
random_allowed = FALSE
spikyponytail
name = "Spiky Ponytail"
id = "spikyponytail"
Expand Down Expand Up @@ -641,6 +689,10 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
name = "Pigtails"
id = "pig"
gender = FEMININE
pig_half
name = "Pigtails: Split"
id = "pig_half"
random_allowed = FALSE
pompompigtail
name = "Pompom Pigtails"
id = "pompompigtail"
Expand All @@ -661,6 +713,10 @@ TYPEINFO(/datum/customization_style/hair/gimmick)
name = "Wavy Ponytail"
id = "wavy_tail"
gender = FEMININE
wavy_tail_half
name = "Wavy Ponytail: Split"
id = "wavy_tail_half"
random_allowed = FALSE

gimmick
afroHA
Expand Down
Binary file modified icons/mob/human_hair.dmi
Binary file not shown.