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

Some new hairstyles! #31010

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/accessories/human-hair.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,5 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
marking-HumanHairVlongfringe = Very Long with Fringe
marking-HumanHairVolaju = Volaju
marking-HumanHairWisp = Wisp
marking-HumanHairArtist = Shaped
marking-HumanHairCapsdaughter = Long Bow
Original file line number Diff line number Diff line change
Expand Up @@ -1363,3 +1363,17 @@
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: classiclong3
- type: marking
id: HumanHairArtist
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: artist
- type: marking
id: HumanHairCapsdaughter
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: capsdaughter
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,14 @@
{
"name": "classiclong3",
"directions": 4
},
{
"name": "artist",
"directions": 4
},
{
"name": "capsdaughter",
"directions": 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs commas here after the names

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

}
]
}
Loading