Skip to content

Commit

Permalink
adds (steals) a few new hairs (from skyrat and bubber) (#5968)
Browse files Browse the repository at this point in the history
## About The Pull Request

see title. most of these are feminine. sorry male enjoyers!

previews graciously provided by icondiffbot because i'm not spending
another 47 minutes initialising a server

https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/5968/checks?check_run_id=16686590818

## Why It's Good For The Game

i love playing barbie dressup in the atmos simulator

## Changelog

:cl:
add: Added some new hairstyles. These are Braid Medium, Damsel, Diagonal
Bangs, Glamour, Hairfre, Jay, Ponytail Simple, Royal Curls, Runner, and
Wavy.
imageadd: Added sprites to the above hairstyles.
imageadd: Fixed missing pixels on Fluffy Short.
/:cl:
  • Loading branch information
Kraseo authored Sep 13, 2023
1 parent 9ac1e57 commit 5ed41f2
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 6 deletions.
64 changes: 58 additions & 6 deletions code/modules/sprite_accessories/hair/_hair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
id = "hair_80s"
icon_state = "hair_80s"

/datum/sprite_accessory/hair/fluffyshort
name = "Fluffy Short"
id = "hair_fluffyshort"
icon_state = "hair_fluffy_short"

/datum/sprite_accessory/hair/eighties_alt
name = "80's (Alternative)"
id = "hair_80s_alt"
Expand Down Expand Up @@ -165,9 +160,15 @@
icon_state = "hair_hbraid"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/mbraid
/datum/sprite_accessory/hair/braid_medium
name = "Braid Medium"
id = "hair_braid_medium"
icon_state = "hair_mediumbraid"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/braid_short
name = "Braid Short"
id = "hair_braid_short"
icon_state = "hair_shortbraid"
hair_flags = HAIR_TIEABLE

Expand Down Expand Up @@ -266,6 +267,11 @@
icon_state = "hair_c"
hair_flags = HAIR_VERY_SHORT

/datum/sprite_accessory/hair/damsel
name = "Damsel"
id = "hair_damsel"
icon_state = "hair_damsel"

/datum/sprite_accessory/hair/dave
name = "Dave"
id = "hair_dave"
Expand All @@ -276,6 +282,11 @@
id = "hair_devillock"
icon_state = "hair_devilock"

/datum/sprite_accessory/hair/diagonal_bangs
name = "Diagonal Bangs"
id = "hair_diagonalbangs"
icon_state = "hair_diagonal_bangs"

/datum/sprite_accessory/hair/dreadlocks
name = "Dreadlocks"
id = "hair_dreadlocks"
Expand Down Expand Up @@ -374,6 +385,11 @@
id = "hair_flow"
icon_state = "hair_f"

/datum/sprite_accessory/hair/fluffy_short
name = "Fluffy Short"
id = "hair_fluffy_short"
icon_state = "hair_fluffy_short"

/datum/sprite_accessory/hair/longfringe
name = "Fringe Long"
id = "hair_fringe_long"
Expand Down Expand Up @@ -403,12 +419,22 @@
icon_state = "hair_gentle"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/glamour
name = "Glamour"
id = "hair_glamour"
icon_state = "hair_glamour"

/datum/sprite_accessory/hair/glossy
name = "Glossy"
id = "hair_glossy"
icon_state = "hair_glossy"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/hairfre
name = "Hairfre"
id = "hair_hairfre"
icon_state = "hair_hairfre"

/datum/sprite_accessory/hair/halfbang
name = "Half-banged Hair"
id = "hair_halfbang"
Expand Down Expand Up @@ -453,6 +479,11 @@
id = "hair_jade"
icon_state = "hair_jade"

/datum/sprite_accessory/hair/jay
name = "Jay"
id = "hair_jay"
icon_state = "hair_jay"

/datum/sprite_accessory/hair/jensen
name = "Jensen"
id = "hair_jensen"
Expand Down Expand Up @@ -672,6 +703,12 @@
icon_state = "hair_sharpponytail"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/simple_ponytail
name = "Ponytail Simple"
id = "hair_simple_ponytail"
icon_state = "hair_simple_ponytail"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/spikyponytail
name = "Ponytail Spiky"
id = "hair_ponytail_spiky"
Expand Down Expand Up @@ -749,6 +786,16 @@
icon_state = "hair_rowbraid"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/royal_curls
name = "Royal Curls"
id = "hair_royal_curls"
icon_state = "hair_royal_curls"

/datum/sprite_accessory/hair/runner
name = "Runner"
id = "hair_runner"
icon_state = "hair_runner"

/datum/sprite_accessory/hair/sabitsuki
name = "Sabitsuki"
id = "hair_sabitsuki"
Expand Down Expand Up @@ -949,6 +996,11 @@
icon_state = "hair_volaju"
hair_flags = HAIR_TIEABLE

/datum/sprite_accessory/hair/wavy
name = "Wavy"
id = "hair_wavy"
icon_state = "hair_wavy"

/datum/sprite_accessory/hair/wisp
name = "Wisp"
id = "hair_wisp"
Expand Down
Binary file modified icons/mob/human_face.dmi
Binary file not shown.
Binary file modified icons/mob/human_face_m.dmi
Binary file not shown.

0 comments on commit 5ed41f2

Please sign in to comment.