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.

Sign up for GitHub

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

Ombre and Crewcut haircuts classic variants #402

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Ombre and Crewcut haircuts classic variants #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d148700
Ombre and Crewcut
FluffiestFloof Nov 5, 2023
03a775e
Update hair.ftl
Colin-Tel Nov 6, 2023
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: 3 additions & 1 deletion Resources/Locale/en-US/deltav/accessories/hair.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ marking-HumanHairMessyClassic = Messy Classic
marking-HumanHairClassicGentle = Gentle Classic
marking-HumanHairClassicNoFade = Fade (None, Classic)
marking-HumanHairClassicLowFade = Fade (Low, Classic)
marking-HumanHairClassicMedFade = Fade (Medium. Classic)
marking-HumanHairClassicMedFade = Fade (Medium, Classic)
marking-HumanHairClassicOmbre = Ombre Classic
marking-HumanHairClassicCrewcut = Crewcut Classic
28 changes: 22 additions & 6 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,60 @@
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: bobclassic
state: classic_bob

- type: marking
id: HumanHairMessyClassic
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: messyclassic
state: classic_messy

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

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

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

- type: marking
id: HumanHairClassicMedFade
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: classicmedfade
state: classic_medfade

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

- type: marking
id: HumanHairClassicCrewcut
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: DeltaV/Mobs/Customization/hair.rsi
state: classic_crewcut
0 ...obs/Customization/hair.rsi/bobclassic.png → ...bs/Customization/hair.rsi/classic_bob.png
View file
Open in desktop
File renamed without changes
Binary file added Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_crewcut.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 .../Customization/hair.rsi/classicgentle.png → ...Customization/hair.rsi/classic_gentle.png
View file
Open in desktop
File renamed without changes
0 ...Customization/hair.rsi/classiclowfade.png → ...ustomization/hair.rsi/classic_lowfade.png
View file
Open in desktop
File renamed without changes
0 ...Customization/hair.rsi/classicmedfade.png → ...ustomization/hair.rsi/classic_medfade.png
View file
Open in desktop
File renamed without changes
0 ...s/Customization/hair.rsi/messyclassic.png → .../Customization/hair.rsi/classic_messy.png
View file
Open in desktop
File renamed without changes
0 .../Customization/hair.rsi/classicnofade.png → ...Customization/hair.rsi/classic_nofade.png
View file
Open in desktop
File renamed without changes
Binary file added Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_ombre.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 14 additions & 6 deletions Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,35 @@
"directions": 4
},
{
"name":"bobclassic",
"name":"classic_bob",
"directions": 4
},
{
"name":"messyclassic",
"name":"classic_messy",
"directions":4
},
{
"name":"classicgentle",
"name":"classic_gentle",
"directions": 4
},
{
"name":"classiclowfade",
"name":"classic_lowfade",
"directions": 4
},
{
"name":"classicmedfade",
"name":"classic_medfade",
"directions": 4
},
{
"name":"classicnofade",
"name":"classic_nofade",
"directions": 4
},
{
"name":"classic_ombre",
"directions": 4
},
{
"name":"classic_crewcut",
"directions": 4
}
]
Expand Down
Loading