Arachnid Markings Expansion (#19439)

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

@@ -1,32 +1,40 @@
-marking-ArachnidCheliceraeBasic = Chelicerae (Basic)
+marking-ArachnidCheliceraeDownwards = Chelicerae (Downwards)
-marking-ArachnidCheliceraeBasic-basic = Chelicerae
+marking-ArachnidCheliceraeDownwards-downwards = Chelicerae
+
+marking-ArachnidCheliceraeInwards = Chelicerae (Inwards)
+marking-ArachnidCheliceraeInwards-inwards = Chelicerae
 
 marking-ArachnidAppendagesDefault = Appendages (Long)
-marking-ArachnidAppendagesDefault-long = Appendage
+marking-ArachnidAppendagesDefault-long_primary = Appendage
+marking-ArachnidAppendagesDefault-long_secondary = Stripes
 
 marking-ArachnidAppendagesSharp = Appendages (Sharp)
-marking-ArachnidAppendagesSharp-sharp = Appendage
+marking-ArachnidAppendagesSharp-sharp_primary = Appendage
+marking-ArachnidAppendagesSharp-sharp_secondary = Stripes
 
 marking-ArachnidAppendagesZigZag = Appendages (ZigZag)
-marking-ArachnidAppendagesZigZag-zigzag = Appendage
+marking-ArachnidAppendagesZigZag-zigzag_primary = Appendage
+marking-ArachnidAppendagesZigZag-zigzag_secondary = Stripes
 
 marking-ArachnidAppendagesCurled = Appendages (Curled)
-marking-ArachnidAppendagesCurled-curled = Appendage
+marking-ArachnidAppendagesCurled-curled_primary = Appendage
+marking-ArachnidAppendagesCurled-curled_secondary = Stripes
 
 marking-ArachnidAppendagesStingers = Appendages (Stingers)
-marking-ArachnidAppendagesStingers-stingers = Appendage
+marking-ArachnidAppendagesStingers-stingers_primary = Appendage
+marking-ArachnidAppendagesStingers-stingers_secondary = Stripes
 
 marking-ArachnidAppendagesChipped = Appendages (Chipped)
-marking-ArachnidAppendagesChipped-chipped = Appendage
+marking-ArachnidAppendagesChipped-chipped_primary = Appendage
-
+marking-ArachnidAppendagesChipped-chipped_secondary = Stripes
-marking-ArachnidAppendagesCurled = Appendages (Curled)
-marking-ArachnidAppendagesCurled-curled = Appendage
 
 marking-ArachnidAppendagesHarvest = Appendages (Harvest)
-marking-ArachnidAppendagesHarvest-harvest = Appendage
+marking-ArachnidAppendagesHarvest-harvest_primary = Appendage
+marking-ArachnidAppendagesHarvest-harvest_secondary = Stripes
 
 marking-ArachnidAppendagesShort = Appendages (Short)
-marking-ArachnidAppendagesShort-short = Appendage
+marking-ArachnidAppendagesShort-short_primary = Appendage
+marking-ArachnidAppendagesShort-short_secondary = Stripes
 
 marking-ArachnidTorsoStripes = Stripes
 marking-ArachnidTorsoStripes-stripes = Design
@@ -51,3 +59,32 @@ marking-ArachnidTorsoNailAndHammer-nail-and-hammer = Design
 
 marking-ArachnidTorsoStar = Star
 marking-ArachnidTorsoStar-star = Design
+
+marking-ArachnidTorsoArrows = Arrows
+marking-ArachnidTorsoArrows-arrows = Design
+
+marking-ArachnidTorsoCore = Core
+marking-ArachnidTorsoCore-core = Design
+
+marking-ArachnidTorsoFiddleback = Fiddleback
+marking-ArachnidTorsoFiddleback-fiddleback = Design
+
+marking-ArachnidTorsoSkull = Skull
+marking-ArachnidTorsoSkull-skull = Design
+
+marking-ArachnidTorsoTarget = Target
+marking-ArachnidTorsoTarget-target = Design
+
+marking-ArachnidRArmStripes = Arachnid Stripes (Right)
+marking-ArachnidRArmStripes-stripes_right = Stripes
+
+marking-ArachnidLArmStripes = Arachnid Stripes (Left)
+marking-ArachnidLArmStripes-stripes_left = Stripes
+
+marking-ArachnidRLegStripes = Arachnid Stripes (Right)
+marking-ArachnidRLegStripes-stripes_right = Stripes
+
+marking-ArachnidLLegStripes = Arachnid Stripes (Left)
+marking-ArachnidLLegStripes-stripes_left = Stripes
+
+marking-ArachnidOverlayFuzzy = Fuzzy

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

@@ -1,12 +1,21 @@
 # Chelicerae
 - type: marking
-  id: ArachnidCheliceraeBasic
+  id: ArachnidCheliceraeDownwards
   bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chelicerae.rsi
-    state: basic
+    state: downwards
+
+- type: marking
+  id: ArachnidCheliceraeInwards
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chelicerae.rsi
+    state: inwards
 
 # Appendages
 - type: marking
@@ -16,7 +25,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: long
+    state: long_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: long_secondary
 
 - type: marking
   id: ArachnidAppendagesSharp
@@ -25,7 +36,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: sharp
+    state: sharp_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: sharp_secondary
 
 - type: marking
   id: ArachnidAppendagesStingers
@@ -34,7 +47,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: stingers
+    state: stingers_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: stingers_secondary
 
 - type: marking
   id: ArachnidAppendagesZigZag
@@ -43,7 +58,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: zigzag
+    state: zigzag_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: zigzag_secondary
 
 - type: marking
   id: ArachnidAppendagesCurled
@@ -52,7 +69,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: curled
+    state: curled_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: curled_secondary
 
 - type: marking
   id: ArachnidAppendagesChipped
@@ -61,7 +80,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: chipped
+    state: chipped_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: chipped_secondary
 
 - type: marking
   id: ArachnidAppendagesHarvest
@@ -70,7 +91,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: harvest
+    state: harvest_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: harvest_secondary
 
 - type: marking
   id: ArachnidAppendagesShort
@@ -79,7 +102,9 @@
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: short
+    state: short_primary
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: short_secondary
 
 # Chest
 - type: marking
@@ -185,3 +210,134 @@
     default:
       type:
         !type:EyeColoring
+
+- type: marking
+  id: ArachnidTorsoArrows
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: arrows
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+- type: marking
+  id: ArachnidTorsoCore
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: core
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+- type: marking
+  id: ArachnidTorsoFiddleback
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: fiddleback
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+- type: marking
+  id: ArachnidTorsoSkull
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: skull
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+- type: marking
+  id: ArachnidTorsoTarget
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: target
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+# Arms
+- type: marking
+  id: ArachnidRArmStripes
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/arms.rsi
+    state: stripes_right
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+- type: marking
+  id: ArachnidLArmStripes
+  bodyPart: LArm
+  markingCategory: Arms
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/arms.rsi
+    state: stripes_left
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+# Legs
+- type: marking
+  id: ArachnidRLegStripes
+  bodyPart: RLeg
+  markingCategory: Legs
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/legs.rsi
+    state: stripes_right
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+- type: marking
+  id: ArachnidLLegStripes
+  bodyPart: LLeg
+  markingCategory: Legs
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/legs.rsi
+    state: stripes_left
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+
+# Overlay
+- type: marking
+  id: ArachnidOverlayFuzzy
+  bodyPart: Chest
+  markingCategory: Overlay
+  forcedColoring: true
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy
+

Resources/Prototypes/Species/arachnid.yml

@@ -21,8 +21,8 @@
     Snout: MobHumanoidAnyMarking
     Chest: MobArachnidTorso
     HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidMarkingMatchSkin
+    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidMarkingMatchSkin
+    Tail: MobHumanoidAnyMarking
     Eyes: MobArachnidEyes
     LArm: MobArachnidLArm
     RArm: MobArachnidRArm
@@ -59,7 +59,7 @@
     HeadSide:
       points: 1
       required: true
-      defaultMarkings: [ ArachnidCheliceraeBasic ]
+      defaultMarkings: [ ArachnidCheliceraeDownwards ]
     Chest:
       points: 1
       required: false

Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json

@@ -8,35 +8,67 @@
   },
   "states": [
     {
-      "name": "long",
+      "name": "long_primary",
       "directions": 4
     },
     {
-      "name": "sharp",
+      "name": "long_secondary",
       "directions": 4
     },
     {
-      "name": "stingers",
+      "name": "sharp_primary",
       "directions": 4
     },
     {
-      "name": "curled",
+      "name": "sharp_secondary",
       "directions": 4
     },
     {
-      "name": "zigzag",
+      "name": "stingers_primary",
       "directions": 4
     },
     {
-      "name": "chipped",
+      "name": "stingers_secondary",
       "directions": 4
     },
     {
-      "name": "harvest",
+      "name": "curled_primary",
       "directions": 4
     },
     {
-      "name": "short",
+      "name": "curled_secondary",
+      "directions": 4
+    },
+    {
+      "name": "zigzag_primary",
+      "directions": 4
+    },
+    {
+      "name": "zigzag_secondary",
+      "directions": 4
+    },
+    {
+      "name": "chipped_primary",
+      "directions": 4
+    },
+    {
+      "name": "chipped_secondary",
+      "directions": 4
+    },
+    {
+      "name": "harvest_primary",
+      "directions": 4
+    },
+    {
+      "name": "harvest_secondary",
+      "directions": 4
+    },
+    {
+      "name": "short_primary",
+      "directions": 4
+    },
+    {
+      "name": "short_secondary",
       "directions": 4
     }
   ]

Resources/Textures/Mobs/Customization/Arachnid/arms.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Nairodian (github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "stripes_left",
+      "directions": 4
+    },
+    {
+      "name": "stripes_right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Mobs/Customization/Arachnid/chelicerae.rsi/meta.json

@@ -1,14 +1,18 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
+  "copyright": "Downwards made by PixelTheKermit (github) for SS14. Inwards made by Nairodian (github) for SS14",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "basic",
+      "name": "downwards",
+      "directions": 4
+    },
+    {
+      "name": "inwards",
       "directions": 4
     }
   ]

Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
+  "copyright": "Made by PixelTheKermit (github) for SS14. Arrows, core, fiddleback, skull and target made by Nairodian (github) for SS14.",
   "size": {
     "x": 32,
     "y": 32
@@ -38,6 +38,26 @@
     {
       "name": "star",
       "directions": 4
+    },
+    {
+      "name": "arrows",
+      "directions": 4
+    },
+    {
+      "name": "core",
+      "directions": 4
+    },
+    {
+      "name": "fiddleback",
+      "directions": 4
+    },
+    {
+      "name": "skull",
+      "directions": 4
+    },
+    {
+      "name": "target",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Mobs/Customization/Arachnid/legs.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Nairodian (github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "stripes_left",
+      "directions": 4
+    },
+    {
+      "name": "stripes_right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Nairodian (github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "fuzzy",
+      "directions": 4
+    }
+  ]
+}