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

Add "tailed" hair #25216

Merged
merged 2 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/accessories/human-hair.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ marking-HumanHairSpiky = Spiky 2
marking-HumanHairSpiky2 = Spiky 3
marking-HumanHairSwept = Swept Back Hair
marking-HumanHairSwept2 = Swept Back Hair 2
marking-HumanHairTailed = Tailed
marking-HumanHairThinning = Thinning
marking-HumanHairThinningfront = Thinning (Front)
marking-HumanHairThinningrear = Thinning (Rear)
Expand All @@ -175,6 +176,7 @@ marking-HumanHairTwoStrands = Two Strands
marking-HumanHairUndercut = Undercut
marking-HumanHairUndercutleft = Undercut Left
marking-HumanHairUndercutright = Undercut Right
marking-HumanHairUneven = Uneven
marking-HumanHairUnkept = Unkept
marking-HumanHairUpdo = Updo
marking-HumanHairVlong = Very Long Hair
Expand All @@ -184,4 +186,3 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
marking-HumanHairVlongfringe = Very Long with Fringe
marking-HumanHairVolaju = Volaju
marking-HumanHairWisp = Wisp
marking-HumanHairUneven = Uneven
Original file line number Diff line number Diff line change
Expand Up @@ -1307,3 +1307,10 @@
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: uneven
- type: marking
id: HumanHairTailed
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: tailed
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven is drawn by Ubaser, doublebun_long by Emisse",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse",
"license": "CC-BY-SA-3.0",
"states": [
{
Expand Down Expand Up @@ -758,6 +758,10 @@
{
"name": "uneven",
"directions": 4
},
{
"name": "tailed",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading