Skip to content

[port] Big hair markings batch - #134

Open
yesteryuri wants to merge 10 commits into
TheDenSS14:masterfrom
yesteryuri:hairmarkings
Open

[port] Big hair markings batch#134
yesteryuri wants to merge 10 commits into
TheDenSS14:masterfrom
yesteryuri:hairmarkings

Conversation

@yesteryuri

@yesteryuri yesteryuri commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

About the PR

Ports 291 markings from prebase, various servers of origin. All humanoid hairs. I also grabbed facial hair markings along the way. A few non hair markings that were bundled in the same RSI have also been included

Why / Balance

Customization
BTW two nuclear14 markings were commented out on prebase so I elected to also comment them out but write their protos and ftl so they can be enabled. Radiation and Tunnel Snake. I don't see a reason why they're commented out to be honest.

Technical details

Various RSI from prebase have been placed in the corresponding textures folder of origin, and new DEN MIT yaml has been written. ID names remain consistent, as well as ftl names for searchability, but I've added all of the state names to the ftl too.
The added tattoo markings use unshaded layering formatted as macro examples are.
List of RSIs, I've marked them as claimed on the coordination spreadsheet:
_ADT
-custom.rsi (this included several facial hair and tattoo markings)
-hair.rsi
_Corvax
-human_facial_hair.rsi
-human_hair.rsi
_DEN
-haircepha.rsi
-hairdoppler.rsi (I rewrote this copyright to include as many original artists as I could find and have accurate commits as far back as I could find on the various servers they were ported from)
-mera.rsi
_DV
-hair.rsi (something like 4 or 5 hairs in this RSI were identical to upstream hair not even shaded diff, I deleted them)
_EE
-human_hair.rsi
-z_human_facial_hair.rsi
_Goobstation
-human_hair.rsi
_Impstation
-headcovers.rsi (vox and reptilian markings in their own ymls)
-human_hair.rsi
_Nuclear14
-hair.rsi

Test plan

golobby
select a species with the markings and peruse the painfully long lists
(human, reptilian, vox)
check color if you want to see the state name ftls worked
change gender for the like 4 chest tattoos
go ingame with an unshaded marking and walk into the darkness naked

after each batch i did go through and check that the markings i added got in there good luck out there

Media

image image image

Requirements

  • I have read and am following the Macrocosm Pull Request Conventions.
  • I have tested this pull request and written instructions on how to test it.
  • I have added media to this PR or it does not require an in-game showcase.

Licensing

  • All code in this pull request can be licensed to MIT.
  • (OPTIONAL) I give permission to seeing this feature upstreamed to Macrocosm in the future.
    ( disclaimer that this would be annoying with dupe IDs for imp. i tried to separate commits for cherry-pick warriors )

Breaking changes

I don't think so

Changelog

🆑

  • add: Added all of the humanoid hair and facial hair markings from prebase

@github-actions

Copy link
Copy Markdown
Contributor

RSI Diff Bot; head commit ec0fc93 merging into b44622c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_ADT/Mobs/Customization/custom.rsi

State Old New Status
beard-beardchin Added
beard-beardlong Added
beard-beardshort Added
beard-beardthick Added
beard-beardviking Added
beard-bristle Added
beard-mustachewithstubble Added
beard-thickbristle Added
hair-arabicgatheredhair Added
hair-classichairmale Added
hair-combedfromside Added
hair-longhair Added
hair-manbunold Added
hair-pigtailtajaran Added
hair-shavedside Added
hair-shorthaired Added
hair-womenbun Added
tattoo_KrenelMercenary Added
tattoo_Rose Added
tattoo_Rose_female Added
tattoo_arm_imheartmom_l Added
tattoo_arm_imheartmom_r Added
tattoo_churchdomes Added
tattoo_churchdomes_female Added
tattoo_elysium_patriotism Added
tattoo_fullskelet Added
tattoo_karabel Added
tattoo_karabel_female Added
tattoo_line_arm_l Added
tattoo_line_arm_r Added
tattoo_narsi Added
tattoo_serpenttemptation Added
tattoo_serpenttemptation_female Added
tattoo_skelet_arm_l Added
tattoo_skelet_arm_r Added
tattoo_skelet_body Added
tattoo_skelet_foot_l Added
tattoo_skelet_foot_r Added
tattoo_skelet_leg_l Added
tattoo_skelet_leg_r Added
tattoo_skull Added
tattoo_skull_face Added
tattoo_symbol_elysium Added
tattooarm-laza_l Added
tattooarm-laza_r Added

Resources/Textures/_ADT/Mobs/Customization/hair.rsi

State Old New Status
honor Added
shaved_female Added

Resources/Textures/_Corvax/Mobs/Customization/human_facial_hair.rsi

State Old New Status
handlebar Added
handlebar2 Added

Resources/Textures/_Corvax/Mobs/Customization/human_hair.rsi

State Old New Status
africanpigtails Added
afropuffdouble Added
afropuffleft Added
afropuffright Added

Resources/Textures/_DEN/Mobs/Customization/Hair/haircepha.rsi

State Old New Status
longsmoothie Added
shortbob Added
shortside Added
twintailsberly Added

Resources/Textures/_DEN/Mobs/Customization/Hair/hairdoppler.rsi

State Old New Status
hair_amazon Added
hair_astolfo Added
hair_baum Added
hair_beachwave Added
hair_bluntbangs Added
hair_bluntbangs_alt Added
hair_braided_front Added
hair_braided_sidetail Added
hair_bunhead4 Added
hair_combed Added
hair_combedbob Added
hair_cotton Added
hair_cottonalt Added
hair_curly Added
hair_dave Added
hair_diagonal_bangs Added
hair_diagonal_bangs_alt Added
hair_dreadlocks_long Added
hair_firestarter Added
hair_fluffy_bangs Added
hair_fluffy_short Added
hair_fortuneteller Added
hair_fortuneteller_alt Added
hair_froofylong Added
hair_geisha Added
hair_gentle_bun Added
hair_gentle_duo_bun Added
hair_glammetal Added
hair_gloomy_long Added
hair_gloomy_longer Added
hair_gloomy_medium Added
hair_grande Added
hair_hairfre Added
hair_halfcut Added
hair_halfcut_rough Added
hair_holo_tuber Added
hair_hyenamane Added
hair_impish Added
hair_jay Added
hair_jessica Added
hair_kajam Added
hair_lila Added
hair_long4 Added
hair_longdtails Added
hair_longovereye_alt Added
hair_longsidepartstraight Added
hair_loose_slicked Added
hair_mcsqueeb Added
hair_mediumbraid Added
hair_mermaid Added
hair_mia Added
hair_mohawkshort Added
hair_newyou Added
hair_phoenix Added
hair_phoenix_half_shaven Added
hair_poofy Added
hair_punktails Added
hair_quadcurls Added
hair_ring_tails Added
hair_rowbraid Added
hair_rowdualtail Added
hair_royal_curls Added
hair_runner Added
hair_runner_bun Added
hair_sabitsuki Added
hair_scully Added
hair_short_tassles Added
hair_shy Added
hair_sleaze Added
hair_slightlymessy Added
hair_spicy Added
hair_spikey Added
hair_spikey_long Added
hair_stacy Added
hair_stacy_bun Added
hair_strict Added
hair_strict_long Added
hair_strict_short Added
hair_toriyama Added
hair_tri_bun Added
hair_tri_bun_long Added
hair_twintail Added
hair_violet Added
hair_violet_ponytail Added
hair_viper Added
hair_volajupompless Added
hair_ziegler Added
hair_zoey Added
halfshave_glamorous Added
halfshave_long Added
halfshave_messy Added
halfshave_messylong Added
inari Added

Resources/Textures/_DEN/Mobs/Customization/Hair/mera.rsi

State Old New Status
hair_mera Added

Resources/Textures/_DV/Mobs/Customization/hair.rsi

State Old New Status
classic_bob Added
classic_gentle Added
classic_long Added
classic_messy Added
classic_ombre Added
short_bedhead Added

Resources/Textures/_EE/Mobs/Customization/human_hair.rsi

State Old New Status
buzzhawk Added
ciacombover Added
flyboy Added
fullshave Added
hightight Added
loosebun Added
loosebunshaved Added
outwardponytail Added
overeyeponytail Added
sergeantcut Added
stubbleshave Added

Resources/Textures/_EE/Mobs/Customization/z_human_facial_hair.rsi

State Old New Status
emwhiskers Added
onthechin Added
spiderwhiskers Added
twirlable Added
voluminous Added
walrus Added
wizardous Added
workinman Added

Resources/Textures/_Goobstation/Mobs/Customization/human_hair.rsi

State Old New Status
braidedExtensions Added
cometTail Added
fantasyHair Added
flatTwistsUpdo Added
floorlengthBraid Added
floorlengthWavy Added
frizzyBraid Added
frontBraidsLong Added
frontBraidsMedium Added
frontBraidsShort Added
hairnet Added
jellyfish Added
kazuyaMishima Added
longBraids Added
longCurvy Added
longPompadour Added
mediumCurls Added
mullet Added
pelvicLengthBraid Added
plateau Added
queenBee Added
saggedMohawk Added
sharpMohawk Added
shortAndPoofy Added
shortCurls Added
shoulderLengthBraid Added
sideSpike Added
spaceLoops Added
star Added
starFro Added
styledCurls Added
unkemptScientist Added
wispy Added

Resources/Textures/_Impstation/Mobs/Customization/headcovers.rsi

State Old New Status
burqalizard Added
burqasolid Added
hijabchic Added
hijabchicvox Added
hijabsimple Added
hijabsimplevox Added
niqab Added
niqablizard Added
tichelfashionable Added
tichelfashionablevox Added
tichelsimple Added
tichelsimplevox Added

Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi

State Old New Status
adoringfan Added
asymbun Added
babyhair Added
baldingcurls Added
baldinglong Added
braidmed Added
chonmage Added
curlyperm Added
drilltail Added
eyebanglong Added
eyebangshort Added
eyebangsidetail Added
fadehighlight Added
frenchbraid Added
friar Added
fringebraid Added
fringerat Added
fringetail Added
gatheredlow Added
intakelong Added
intakeshort Added
liberatorlong Added
liberatorshort Added
liberatortied Added
locstied Added
lowpigtails Added
messyponytail Added
middlepartshort Added
overeyes Added
overeyeslong Added
overeyestail Added
posterperson Added
shaggy Added
shaggylonger Added
shaggymessy Added
smiler Added
spikyponytaillong Added
susie Added
susienobangs Added
wavylong Added

Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi

State Old New Status
faded Added
front_spikes Added
half_shaved_braids Added
halfsies Added
lone_tail Added
long_spikehair Added
manageable_mess Added
matted_spikes Added
messy_ponytail Added
mini_matted_spikes Added
monk Added
natural_mess_long Added
natural_mess_short Added
nerfish Added
over_shoulder_braids Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant