Skip to content

Commit

Permalink
Hair! (#51)
Browse files Browse the repository at this point in the history
* Hair!

Things are about to get hairy

* Added "Classic Gentle"

* Added Classic Fades

Classic High fade is indistinguishable from High fade,  at least to me it is.

* Update meta.json

:trollface:

* Moved the hair over there

Moved the added hairstyles to Delta directory

* Update hair.yml

whitespace :trollface:

* Update meta.json

untouched the file

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update meta.json

why didn't it do this last commit grrr aaah

* Take the hair you wanna wear

Fully removed the added hairstyles from any upstream files.

* Update hair.yml

lol

* Update hair.ftl

per floofy review

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update hair.ftl

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
  • Loading branch information
Colin-Tel committed Oct 24, 2023
1 parent d0a4745 commit c0fbf71
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 0 deletions.
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 = Gentle Classic
marking-HumanHairClassicNoFade = Fade (None, Classic)
marking-HumanHairClassicLowFade = Fade (Low, Classic)
marking-HumanHairClassicMedFade = Fade (Medium. Classic)
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
}
]
}

0 comments on commit c0fbf71

Please sign in to comment.