Skip to content

Commit

Permalink
Cherry-picked commit 76db710 from space-wizards/space-station-14/master
Browse files Browse the repository at this point in the history
  • Loading branch information
UnicornOnLSD authored and SimpleStation14 committed Apr 21, 2024
1 parent 3bf08c7 commit 964e6e8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/accessories/human-hair.ftl
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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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

0 comments on commit 964e6e8

Please sign in to comment.