Skip to content

Adds hair style! #5264

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.

Sign up for GitHub

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

Open
Spitegremlin wants to merge 15 commits into
base: main
Choose a base branch
from
+15 −1
Open

Adds hair style! #5264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a46c04d
Adds hair style!
Spitegremlin Feb 16, 2026
30bb5fa
Merge remote-tracking branch 'upstream/main' into Learning-branch
Spitegremlin Feb 16, 2026
3f62f2a
Fixed conflict hopefully
Spitegremlin Feb 16, 2026
db79482
Merge branch 'main' into Learning-branch
Spitegremlin Feb 16, 2026
dc6634e
Merge branch 'main' into Learning-branch
Spitegremlin Feb 17, 2026
d9e988f
I added another hair style, and thats it!
Spitegremlin Feb 17, 2026
c6b4360
Fixed hair not looking right, for both! open soon
Spitegremlin Feb 19, 2026
d7307fa
Merge branch 'main' into Learning-branch
Spitegremlin Feb 19, 2026
cac493b
After doing a little more editing, its all done!
Spitegremlin Feb 19, 2026
df12075
Merge branch 'Learning-branch' of https://github.com/Spitegremlin/Van…
Spitegremlin Feb 19, 2026
2d53a6b
oops, forgot to edit west fluff after doin front
Spitegremlin Feb 19, 2026
a0b9674
Merge branch 'main' into Learning-branch
Spitegremlin Feb 19, 2026
ad552e6
E Edit for curls to fix for elfs and not matchin
Spitegremlin Feb 22, 2026
3e071c5
Fixing the rest of curls, missed it before
Spitegremlin Feb 22, 2026
fb5eda6
Small finishing touches to curls, fixing not match
Spitegremlin Feb 24, 2026
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
4 changes: 3 additions & 1 deletion code/modules/client/customizer/customizers/bodypart_feature/hair.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
/datum/sprite_accessory/hair/head/unkemptcurls,
/datum/sprite_accessory/hair/head/viper,
/datum/sprite_accessory/hair/head/shrinepriestess,
/datum/sprite_accessory/hair/head/tangled_curls,
/datum/sprite_accessory/hair/head/knots,
/datum/sprite_accessory/hair/head/sun,
/datum/sprite_accessory/hair/head/mediumlocs,
Expand All @@ -344,7 +345,8 @@
/datum/sprite_accessory/hair/head/dualtwists,
/datum/sprite_accessory/hair/head/twistbun,
/datum/sprite_accessory/hair/head/longestcurls,
/datum/sprite_accessory/hair/head/sidebraid
/datum/sprite_accessory/hair/head/sidebraid,
/datum/sprite_accessory/hair/head/wild_fluff
)

/datum/customizer/bodypart_feature/hair/head/humanoid/triton
Expand Down
12 changes: 12 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessories/hairs/head_hair.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,18 @@
gender = NEUTER
specuse = list(SPEC_ID_ELF)

/datum/sprite_accessory/hair/head/tangled_curls
name = "Tangled Curls"
icon_state = "tangled_curls"
gender = NEUTER
specuse = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_ELF, SPEC_ID_AASIMAR, SPEC_ID_TIEFLING, SPEC_ID_HALF_ORC)

/datum/sprite_accessory/hair/head/wild_fluff
name = "Wild Fluff"
icon_state = "wild_fluff"
gender = NEUTER
specuse = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_ELF, SPEC_ID_AASIMAR, SPEC_ID_TIEFLING, SPEC_ID_HALF_ORC)

// Hairs below ported from Azure

/datum/sprite_accessory/hair/head/gloomy
Expand Down
Binary file modified icons/roguetown/mob/hair.dmi
View file
Open in desktop
Binary file not shown.
Loading