Skip to content

Commit

Permalink
Merge pull request #1096 from honeyed-lemons/bodyhair-new
Browse files Browse the repository at this point in the history
Bodyhair!
  • Loading branch information
Darkmajia authored Dec 22, 2024
2 parents 96a6d28 + c11b69f commit 5ddbf08
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
marking-BodyhairHumanMale-human_bodyhair_male = Body Hair
marking-BodyhairHumanMale = Body Hair
marking-BodyhairHumanFemale-human_bodyhair_female = Body Hair
marking-BodyhairHumanFemale = Body Hair
marking-BodyhairSpelf-spelf_bodyhair = Body Hair
marking-BodyhairSpelf = Body Hair
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
- type: marking
id: BodyhairHumanMale
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [ Dwarf, Human ]
sexRestriction: [ Male ]
sprites:
- sprite: _Impstation/Mobs/Customization/bodyhair.rsi
state: human_bodyhair_male

- type: marking
id: BodyhairHumanFemale
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [ Dwarf, Human ]
sexRestriction: [ Female ]
sprites:
- sprite: _Impstation/Mobs/Customization/bodyhair.rsi
state: human_bodyhair_female

- type: marking
id: BodyhairSpelf
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [ SpElf ]
sprites:
- sprite: _Impstation/Mobs/Customization/bodyhair.rsi
state: spelf_bodyhair
Binary file modified Resources/Textures/Mobs/Species/Human/parts.rsi/torso_m.png
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": 1,
"copyright": "Made for Impstation by Honeyed_Lemons_",
"license": "CC-BY-SA-4.0",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "human_bodyhair_male",
"directions": 4
},
{
"name": "human_bodyhair_female",
"directions": 4
},
{
"name": "spelf_bodyhair",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5ddbf08

Please sign in to comment.