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

Add "Shoulder-length Over Eye" hairstyle (I hate those conflicts :/) #20757

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Add "Shoulder-length Over Eye" hairstyle (I hate those conflicts :/) #20757

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
3803145
Fix merge conflict
KingFroozy Oct 5, 2023
4eeda48
Merge branch 'space-wizards:master' into Shoulder-length-over-eye
KingFroozy Oct 5, 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
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 @@ -151,6 +151,7 @@ marking-HumanHairShorthairg = Short Hair 7
marking-HumanHair80s = Short Hair 80s
marking-HumanHairRosa = Short Hair Rosa
marking-HumanHairB = Shoulder-length Hair
marking-HumanHairShoulderLengthOverEye = Shoulder-length Over Eye
marking-HumanHairSidecut = Sidecut
marking-HumanHairSkinhead = Skinhead
marking-HumanHairProtagonist = Slightly Long Hair
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 @@ -1125,6 +1125,13 @@
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: swept2
- type: marking
id: HumanHairShoulderLengthOverEye
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: shoulderlengthovereye
- type: marking
id: HumanHairThinning
bodyPart: Hair
Expand Down
Loading