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

Hair! #51

Merged
merged 17 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from 15 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
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/accessories/hair.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
marking-HumanHairShortBedhead = Short Bedhead
marking-HumanHairBobClassic = Bob Hair Classic
marking-HumanHairMessyClassic = Messy Classic
marking-HumanHairClassicGentle = Classic Gentle
marking-HumanHairClassicNoFade = Classic Fade (None)
marking-HumanHairClassicLowFade = Classic Fade (Low)
marking-HumanHairClassicMedFade = Classic Fade (Medium)
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,35 @@
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: messyclassic

- type: marking
id: HumanHairClassicNoFade
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: classicnofade

- type: marking
id: HumanHairClassicGentle
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: classicgentle

- type: marking
id: HumanHairClassicLowFade
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: classiclowfade

- type: marking
id: HumanHairClassicMedFade
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: classicmedfade
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.
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.
16 changes: 16 additions & 0 deletions Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@
{
"name":"messyclassic",
"directions":4
},
{
"name":"classicgentle",
"directions": 4
},
{
"name":"classiclowfade",
"directions": 4
},
{
"name":"classicmedfade",
"directions": 4
},
{
"name":"classicnofade",
"directions": 4
}
]
}
Loading