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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Marine Hairstyles #6641

Merged
merged 5 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions code/modules/mob/new_player/sprite_accessories/hair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -760,3 +760,52 @@
name = "Gentle Braid"
icon_state = "hair_braid3"
gender = FEMALE

/datum/sprite_accessory/hair/close_cut
name = "Closecut"
icon_state = "hair_close_cut"
gender = MALE

/datum/sprite_accessory/hair/shortbangs2
name = "Short Bangs 2"
icon_state = "hair_short_bangs"

/datum/sprite_accessory/hair/bangs
name = "Long Bangs"
icon_state = "hair_bangs"

/datum/sprite_accessory/hair/bangsreversed
name = "Long Bangs (Reversed)"
icon_state = "hair_reversed_bangs"

/datum/sprite_accessory/hair/flowey
name = "Flowey Sides"
icon_state = "hair_flowey_sides"

/datum/sprite_accessory/hair/twirly
name = "Twirly Hair"
icon_state = "hair_twirly"

/datum/sprite_accessory/hair/ponytail9
name = "Ponytail 9"
icon_state = "hair_ponytail_9"
gender = FEMALE

/datum/sprite_accessory/hair/ponytail10
name = "Ponytail 10"
icon_state = "hair_top_ponytail"
gender = FEMALE

/datum/sprite_accessory/hair/firecracker
name = "Firecracker"
icon_state = "hair_firecracker"

/datum/sprite_accessory/hair/slimtop
name = "Slim Top"
icon_state = "hair_slim_top"
gender = MALE

/datum/sprite_accessory/hair/bun3
name = "Bun"
icon_state = "hair_space_buns"
gender = FEMALE
Binary file modified icons/mob/humans/human_hair.dmi
Binary file not shown.
Loading