Oni Pointy Ears And Tusks

Resources/Locale/en-US/markings/goblin_markings.ftl

@@ -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

Resources/Locale/en-US/markings/oni_feet.ftl

@@ -0,0 +1,2 @@
+marking-OniTwoToedFeet-two_toes= Two-Toed Feet
+marking-OniTwoToedFeet= Two-Toed Feet

Resources/Locale/en-US/markings/pointy_ears.ftl

@@ -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

Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml

@@ -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

Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml

@@ -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

Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml

@@ -22,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -33,7 +33,7 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid,  Oni]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -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

Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml

@@ -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

Resources/Prototypes/Nyanotrasen/Species/Oni.yml

@@ -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

Resources/Prototypes/Species/human.yml

@@ -33,6 +33,7 @@
     RFoot: MobHumanRFoot
     Tail: MobHumanoidAnyMarking # Nyanotrasen - Felinid
     HeadTop: MobHumanoidAnyMarking # Nyanotrasen - Felinid & Oni
+    HeadSide: MobHumanoidAnyMarking
 
 - type: markingPoints
   id: MobHumanMarkingLimits

Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json

@@ -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
+        }
+    ]
+}

Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json

@@ -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
+    }
+  ]
+}

Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json

@@ -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
+    }
+  ]
+}