Merge pull request #197 from Kesiath/markings-for-all

adds tattoos to more races + oni horns

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

@@ -2,7 +2,7 @@
   id: TattooHiveChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Oni, Felinid, Dwarf]
+  speciesRestriction: [Human, Oni, Felinid, Dwarf, Oni]
   coloring:
     default:
       type:
@@ -16,7 +16,7 @@
   id: TattooNightlingChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Oni, Felinid]
   coloring:
     default:
       type:
@@ -30,7 +30,7 @@
   id: TattooSilverburghLeftLeg
   bodyPart: LLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Oni, Felinid]
   coloring:
     default:
       type:
@@ -44,7 +44,7 @@
   id: TattooSilverburghRightLeg
   bodyPart: RLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Oni, Felinid]
   coloring:
     default:
       type:
@@ -58,7 +58,7 @@
   id: TattooCampbellLeftArm
   bodyPart: LArm
   markingCategory: Arms
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Oni, Felinid]
   coloring:
     default:
       type:
@@ -72,7 +72,7 @@
   id: TattooCampbellRightArm
   bodyPart: RArm
   markingCategory: Arms
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Oni, Felinid]
   coloring:
     default:
       type:
@@ -86,7 +86,7 @@
   id: TattooCampbellLeftLeg
   bodyPart: LLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Oni, Felinid]
   coloring:
     default:
       type:
@@ -100,7 +100,7 @@
   id: TattooCampbellRightLeg
   bodyPart: RLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Oni, Felinid]
   coloring:
     default:
       type:
@@ -114,7 +114,7 @@
   id: TattooEyeRight
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Oni, Felinid, Reptilian]
   coloring:
     default:
       type:
@@ -128,7 +128,7 @@
   id: TattooEyeLeft
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Oni, Felinid, Reptilian]
   coloring:
     default:
       type:

Resources/Prototypes/_Nyano/Entities/Mobs/Customization/Markings/oni_horns.yml

@@ -68,3 +68,62 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: double_right_broke_curved
+
+- type: marking
+  id: OniHornAngular
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
+    state: horns_angular
+
+- type: marking
+  id: OniHornCurled
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
+    state: horns_curled
+
+- type: marking
+  id: OniHornRam
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
+    state: horns_ram
+
+- type: marking
+  id: OniHornShort
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
+    state: horns_short
+
+- type: marking
+  id: OniHornSimple
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
+    state: horns_simple
+
+- type: marking
+  id: OniTail
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
+    state: tail_oni

Resources/Prototypes/_Nyano/Species/oni.yml

@@ -25,6 +25,9 @@
       points: 1
       required: true
       defaultMarkings: [ OniHornSingleCurved ]
+    Tail:
+      points: 1
+      required: false
     Chest:
       points: 1
       required: false

Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json

@@ -32,8 +32,40 @@
             "directions": 4
         },
         {
+            "name": "horns_angular",
+            "directions": 4
+        },
+		{
+            "name": "horns_curled",
+            "directions": 4
+        },
+		{
+            "name": "horns_ram",
+            "directions": 4
+        },
+		{
+            "name": "horns_short",
+            "directions": 4
+        },
+		{
+            "name": "horns_simple",
+            "directions": 4
+        },
+		{
             "name": "double_right_broke_curved",
             "directions": 4
+        },
+		{
+            "name": "tail_oni",
+            "directions": 4
+        },
+		{
+            "name": "tail_oni_front",
+            "directions": 4
+        },
+		{
+            "name": "tail_oni_behind",
+            "directions": 4
         }
     ]
 }