Skip to content

Commit

Permalink
Moar hair (mostly ponytails) (#3520)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

# please please, please do not port this to tg or a non-ship server.
this is me asking nicely to not to, i do not want this on a
non-shiptest-like server

Shoutout to braided for being the first hairstyle to make me go "This is
unsalvageable"

## About The Pull Request

part of project re:hair

It's that time again for the ✨re:hair ✨ pull request!

Hair cuts/Replacement chart in case your character breaks:

Braid (High) --> Ponytail (Braided) - Done by @Imaginos16
Braid (Floorlength) --> Ponytail (Braided Short) - Done by @Imaginos16

Ponytail (Long) --> Ponytail (Straight) - Done by rye-rice
Ponytail (High) --> Ponytail (Straight Short) - Done by rye-rice

Ponytail 2 --> Ponytail (Grace) - Done by rye-rice
Ponytail 3 --> Ponytail (Grace) -  Done by rye-rice

Ruby -  Done by rye-rice
Ruby (Long) -  Done by rye-rice

Ponytail (Country) - Done by @Imaginos16
Bobcurl - Done by @Imaginos16


Braided           \\
Braided Front   | --> The Dumpster
Braid (Low)       |
Braid (Short)    /

## Why It's Good For The Game


![image](https://github.com/user-attachments/assets/d4d4419e-6be3-4dbc-a897-944a92482f8d)


![image](https://github.com/user-attachments/assets/c93e2214-5de5-453d-ae92-3a4a2656918c)


![image](https://github.com/user-attachments/assets/f97ac5eb-be9d-4081-a1f8-50b69d96d738)

## Changelog

:cl: Imaginos16, rye-rice
add: A few hairstyles have been resprited!
del: the Braided and Braid line of hairs.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: retlaw34 <[email protected]>
  • Loading branch information
rye-rice and rye-rice authored Oct 12, 2024
1 parent f0c9c3d commit da26ac8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 34 deletions.
53 changes: 19 additions & 34 deletions code/modules/mob/dead/new_player/sprite_accessories/hair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,21 @@
name = "Bowlcut 2"
icon_state = "hair_bowlcut2"

/datum/sprite_accessory/hair/braid
name = "Braid (Floorlength)"
icon_state = "hair_braid"

/datum/sprite_accessory/hair/braided
name = "Braided"
icon_state = "hair_braided"

/datum/sprite_accessory/hair/front_braid
name = "Braided Front"
icon_state = "hair_braidfront"

/datum/sprite_accessory/hair/not_floorlength_braid
name = "Braid (High)"
/datum/sprite_accessory/hair/ponytail_braided
name = "Ponytail (Braided)"
icon_state = "hair_braid2"

/datum/sprite_accessory/hair/lowbraid
name = "Braid (Low)"
icon_state = "hair_hbraid"
/datum/sprite_accessory/hair/ponytail_braided_short
name = "Ponytail (Braided Short)"
icon_state = "hair_braid"

/datum/sprite_accessory/hair/shortbraid
name = "Braid (Short)"
icon_state = "hair_shortbraid"
/datum/sprite_accessory/hair/ponytail_straight
name = "Ponytail (Straight)"
icon_state = "hair_longstraightponytail"

/datum/sprite_accessory/hair/ponytail_straight_short
name = "Ponytail (Straight Short)"
icon_state = "hair_highponytail"

/datum/sprite_accessory/hair/braidtail
name = "Braided Tail"
Expand Down Expand Up @@ -503,12 +495,8 @@
icon_state = "hair_ponytail"

/datum/sprite_accessory/hair/ponytail2
name = "Ponytail 2"
icon_state = "hair_ponytail2"

/datum/sprite_accessory/hair/ponytail3
name = "Ponytail 3"
icon_state = "hair_ponytail3"
name = "Ponytail (Grace)"
icon_state = "hair_ponytailgrace"

/datum/sprite_accessory/hair/ponytail4
name = "Ponytail 4"
Expand All @@ -526,21 +514,14 @@
name = "Ponytail 7"
icon_state = "hair_ponytail7"

/datum/sprite_accessory/hair/highponytail
name = "Ponytail (High)"
icon_state = "hair_highponytail"

/datum/sprite_accessory/hair/stail
name = "Ponytail (Short)"
icon_state = "hair_stail"

/datum/sprite_accessory/hair/longponytail
name = "Ponytail (Long)"
icon_state = "hair_longstraightponytail"

/datum/sprite_accessory/hair/countryponytail
name = "Ponytail (Country)"
icon_state = "hair_country"
icon_state = "hair_ponytailcountry"

/datum/sprite_accessory/hair/fringetail
name = "Ponytail (Fringe)"
Expand Down Expand Up @@ -722,6 +703,10 @@
name = "Ruby"
icon_state = "hair_ruby"

/datum/sprite_accessory/hair/rubylong
name = "Ruby (Long)"
icon_state = "hair_rubylong"

/datum/sprite_accessory/hair/undercut
name = "Undercut"
icon_state = "hair_undercut"
Expand Down
Binary file modified icons/mob/human_face.dmi
Binary file not shown.

0 comments on commit da26ac8

Please sign in to comment.