Skip to content

Commit

Permalink
Oni Pointy Ears And Tusks (Simple-Station#727)
Browse files Browse the repository at this point in the history
# Description

Adds eight pointy ears, two tusks, one feet marking (toes resembling
WarCraft trolls) and human nose markings to Onis. The pointed ears are a
big reference to tieflings (similar to Onis) who often have them.

Onis will now have pointy ears by default, but there is a marking to
disable ears.

5 human nose markings have all been made available to Onis, Harpies, and
Felinids. Onis and Felinids can now get chest scars, originally
humna-only. The tusk markings are originally from Frontier goblins.

The new pointy ears give players the power to make their Onis look like
**tieflings, orcs, elves, goblins**, and more fantasy races.

These markings can potentially be used in the future for other species
like psionic elves.

## Media

**Blood Elf** (Tall Ears)


![image](https://github.com/user-attachments/assets/257c8839-303c-45b2-b129-3f9183e47695)

<details><summary>See more</summary>

**Orc** (Upward Ears, Large Tusks)


![image](https://github.com/user-attachments/assets/46bac694-de88-4e04-a12b-7ff8a8111e7b)

**Night Elf** (Wide Ears)


![image](https://github.com/user-attachments/assets/18813660-cd2c-4d37-800d-bf84b1d7dee5)

**Night Elf** (Slanted Ears)


![image](https://github.com/user-attachments/assets/7f39457b-875d-4c46-a5fb-428a6a535fb1)

**Troll** (Large Ears, Small Tusks, Two-Toed Feet)


![image](https://github.com/user-attachments/assets/d9a0c52e-020d-4b55-bb7e-7a4afed61dcc)

**Character Setup**


![image](https://github.com/user-attachments/assets/35ba27d4-e6d1-4c52-bbc7-0f057df12fc8)


![image](https://github.com/user-attachments/assets/5d9e7690-7118-48b3-95b9-50ee784660e2)

</details>

## Changelog

:cl: Skubman
- add: Onis have received eight new pointy ear markings in the 'Head
(Side)' section that can help them resemble tieflings, orcs, elves,
goblins, trolls, and more.
- add: Onis get two new tusk markings in the 'Snout' section, and a
Two-Toed feet marking in the 'Legs' section.
- add: Felinids, Onis, and Harpies can now select Human nose markings
like the schnozz, blobby nose, and nubby nose.
- add: Felinids and Onis can now select the Chest Scar and Top Surgery
Scar markings.
- tweak: Default Onis now use the Double Curved horn and Upward Ears
markings.
  • Loading branch information
angelofallars authored and tim-mcqueen-ttec committed Aug 18, 2024
1 parent fb95352 commit a608b0a
Show file tree
Hide file tree
Showing 26 changed files with 268 additions and 9 deletions.
9 changes: 9 additions & 0 deletions Resources/Locale/en-US/markings/goblin_markings.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# goblin tusks
marking-GoblinTusksBasic = No Tusks
marking-GoblinTusksBasic-goblin_tusks_none = No Tusks
marking-GoblinTusksSmall = Small Tusks
marking-GoblinTusksSmall-goblin_tusks_small = Small Tusks
marking-GoblinTusksBig = Long Tusks
marking-GoblinTusksBig-goblin_tusks_big = Long Tusks
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/markings/oni_feet.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
marking-OniTwoToedFeet-two_toes= Two-Toed Feet
marking-OniTwoToedFeet= Two-Toed Feet
26 changes: 26 additions & 0 deletions Resources/Locale/en-US/markings/pointy_ears.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
marking-PointyEarsStandard-pointy_ears_standard = Standard Ears
marking-PointyEarsStandard = Standard Ears
marking-PointyEarsWide-pointy_ears_wide = Wide Ears
marking-PointyEarsWide = Wide Ears
marking-PointyEarsSmall-pointy_ears_small = Small Ears
marking-PointyEarsSmall = Small Ears
marking-PointyEarsUpwards-pointy_ears_upwards = Upward Ears
marking-PointyEarsUpwards = Upward Ears
marking-PointyEarsTall-pointy_ears_tall = Tall Ears
marking-PointyEarsTall = Tall Ears
marking-PointyEarsSlanted-pointy_ears_slanted = Slanted Ears
marking-PointyEarsSlanted = Slanted Ears
marking-PointyEarsThin-pointy_ears_thin = Thin Ears
marking-PointyEarsThin = Thin Ears
marking-PointyEarsLarge-pointy_ears_large = Large Ears
marking-PointyEarsLarge = Large Ears
marking-PointyEarsNone-pointy_ears_none = No Ears
marking-PointyEarsNone = No Ears
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
markingCategory: Snout
followSkinColor: true
forcedColoring: true
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
sprites:
- sprite: Mobs/Customization/human_noses.rsi
state: schnozz
Expand All @@ -15,7 +15,7 @@
markingCategory: Snout
followSkinColor: true
forcedColoring: true
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
sprites:
- sprite: Mobs/Customization/human_noses.rsi
state: nubby
Expand All @@ -26,7 +26,7 @@
markingCategory: Snout
followSkinColor: true
forcedColoring: true
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
sprites:
- sprite: Mobs/Customization/human_noses.rsi
state: droop
Expand All @@ -37,7 +37,7 @@
markingCategory: Snout
followSkinColor: true
forcedColoring: true
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
sprites:
- sprite: Mobs/Customization/human_noses.rsi
state: blob
Expand All @@ -48,7 +48,7 @@
markingCategory: Snout
followSkinColor: true
forcedColoring: true
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
sprites:
- sprite: Mobs/Customization/human_noses.rsi
state: uppie
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: marking
id: OniTwoToedFeet
bodyPart: RFoot # Can't be LFoot to avoid visual glitches
markingCategory: Legs
speciesRestriction: [Oni]
coloring:
default:
type:
!type:SimpleColoring
color: "#454545"
sprites:
- sprite: Mobs/Customization/oni_feet.rsi
state: two_toes
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
- type: marking
id: PointyEarsStandard
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_standard

- type: marking
id: PointyEarsWide
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_wide

- type: marking
id: PointyEarsSmall
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_small

- type: marking
id: PointyEarsUpwards
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_upwards

- type: marking
id: PointyEarsTall
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_tall

- type: marking
id: PointyEarsSlanted
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_slanted

- type: marking
id: PointyEarsThin
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_thin

- type: marking
id: PointyEarsLarge
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_large

- type: marking
id: PointyEarsNone
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_none
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
id: ScarTopSurgeryShort
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni]
sexRestriction: [Male]
followSkinColor: true
sprites:
Expand All @@ -33,7 +33,7 @@
id: ScarTopSurgeryLong
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni]
sexRestriction: [Male]
followSkinColor: true
sprites:
Expand All @@ -44,7 +44,7 @@
id: ScarChest
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Human, Dwarf]
speciesRestriction: [Human, Dwarf, Felinid, Oni]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/scars.rsi
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: marking
id: GoblinTusksSmall
bodyPart: Snout
markingCategory: Snout
speciesRestriction: [Oni]
coloring:
default:
type:
!type:SimpleColoring
color: "#d9d9d9"
sprites:
- sprite: Mobs/Customization/goblin_tusks.rsi
state: goblin_tusks_small

- type: marking
id: GoblinTusksBig
bodyPart: Snout
markingCategory: Snout
speciesRestriction: [Oni]
coloring:
default:
type:
!type:SimpleColoring
color: "#d9d9d9"
sprites:
- sprite: Mobs/Customization/goblin_tusks.rsi
state: goblin_tusks_big
9 changes: 8 additions & 1 deletion Resources/Prototypes/Nyanotrasen/Species/Oni.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@
HeadTop:
points: 1
required: true
defaultMarkings: [ OniHornSingleCurved ]
defaultMarkings: [ OniHornDoubleCurved ]
HeadSide:
points: 1
required: false
defaultMarkings: [ PointyEarsUpwards ]
Snout:
points: 2
required: false
Chest:
points: 1
required: false
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Species/human.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
RFoot: MobHumanRFoot
Tail: MobHumanoidAnyMarking # Nyanotrasen - Felinid
HeadTop: MobHumanoidAnyMarking # Nyanotrasen - Felinid & Oni
HeadSide: MobHumanoidAnyMarking

- type: markingPoints
id: MobHumanMarkingLimits
Expand Down
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.
23 changes: 23 additions & 0 deletions Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": 1,
"copyright": "Sprited by erhardsteinhauer (discord)",
"license": "CC-BY-SA-4.0",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "goblin_tusks_small",
"directions": 4
},
{
"name": "goblin_tusks_big",
"directions": 4
},
{
"name": "goblin_tusks_none",
"directions": 4
}
]
}
15 changes: 15 additions & 0 deletions Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by angelofallars (github), two toes based off of Reptilian ( https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi )",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "two_toes",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 47 additions & 0 deletions Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by angelofallars (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "pointy_ears_standard",
"directions": 4
},
{
"name": "pointy_ears_wide",
"directions": 4
},
{
"name": "pointy_ears_small",
"directions": 4
},
{
"name": "pointy_ears_thin",
"directions": 4
},
{
"name": "pointy_ears_upwards",
"directions": 4
},
{
"name": "pointy_ears_tall",
"directions": 4
},
{
"name": "pointy_ears_slanted",
"directions": 4
},
{
"name": "pointy_ears_large",
"directions": 4
},
{
"name": "pointy_ears_none",
"directions": 4
}
]
}
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.
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.
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.

0 comments on commit a608b0a

Please sign in to comment.