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

Jump to bottom

Mirror: new haircut alternative (brought back old one) #162

Merged
merged 1 commit into from
May 6, 2024
Merged

Mirror: new haircut alternative (brought back old one) #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/accessories/human-hair.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ marking-HumanHairCornrowbun = Cornrow Bun
marking-HumanHairCornrowbraid = Cornrow Braid
marking-HumanHairCornrowtail = Cornrow Tail
marking-HumanHairCrewcut = Crewcut
marking-HumanHairCrewcut2 = Crewcut 2
marking-HumanHairCurls = Curls
marking-HumanHairC = Cut Hair
marking-HumanHairDandypompadour = Dandy Pompadour
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,13 @@
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: crewcut
- type: marking
id: HumanHairCrewcut2
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: crewcut2
- type: marking
id: HumanHairCurls
bodyPart: Hair
Expand Down
Binary file added Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.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.
4 changes: 4 additions & 0 deletions Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@
"name": "crewcut",
"directions": 4
},
{
"name": "crewcut2",
"directions": 4
},
{
"name": "curls",
"directions": 4
Expand Down
Loading