Arachnids: New markings, new organs sprites and chelicerae (#18177)

* New markings, new organs sprites and chelicerae

* Update locale

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

@@ -1,22 +1,32 @@
-marking-ArachnidAppendagesDefault = Appendages (long)
+marking-ArachnidCheliceraeBasic = Chelicerae (Basic)
+marking-ArachnidCheliceraeBasic-basic = Chelicerae
+
+marking-ArachnidAppendagesDefault = Appendages (Long)
 marking-ArachnidAppendagesDefault-long = Appendage
-marking-ArachnidAppendagesDefault-web = Web
 
 marking-ArachnidAppendagesSharp = Appendages (Sharp)
 marking-ArachnidAppendagesSharp-sharp = Appendage
-marking-ArachnidAppendagesSharp-web = Web
 
 marking-ArachnidAppendagesZigZag = Appendages (ZigZag)
 marking-ArachnidAppendagesZigZag-zigzag = Appendage
-marking-ArachnidAppendagesSharp-web = Web
 
 marking-ArachnidAppendagesCurled = Appendages (Curled)
 marking-ArachnidAppendagesCurled-curled = Appendage
-marking-ArachnidAppendagesCurled-web = Web
 
 marking-ArachnidAppendagesStingers = Appendages (Stingers)
 marking-ArachnidAppendagesStingers-stingers = Appendage
-marking-ArachnidAppendagesStingers-web = Web
+
+marking-ArachnidAppendagesChipped = Appendages (Chipped)
+marking-ArachnidAppendagesChipped-chipped = Appendage
+
+marking-ArachnidAppendagesCurled = Appendages (Curled)
+marking-ArachnidAppendagesCurled-curled = Appendage
+
+marking-ArachnidAppendagesHarvest = Appendages (Harvest)
+marking-ArachnidAppendagesHarvest-harvest = Appendage
+
+marking-ArachnidAppendagesShort = Appendages (Short)
+marking-ArachnidAppendagesShort-short = Appendage
 
 marking-ArachnidTorsoStripes = Stripes
 marking-ArachnidTorsoStripes-stripes = Design
@@ -29,3 +39,15 @@ marking-ArachnidTorsoCross-cross = Design
 
 marking-ArachnidTorsoX = X
 marking-ArachnidTorsoX-x = Design
+
+marking-ArachnidTorsoHeart = Heart
+marking-ArachnidTorsoHeart-heart = Design
+
+marking-ArachnidTorsoHourglass = Hourglass
+marking-ArachnidTorsoHourglass-hourglass = Design
+
+marking-ArachnidTorsoNailAndHammer = Nail and Hammer
+marking-ArachnidTorsoNailAndHammer-nail-and-hammer = Design
+
+marking-ArachnidTorsoStar = Star
+marking-ArachnidTorsoStar-star = Design

Resources/Prototypes/Body/Organs/arachnid.yml

@@ -22,8 +22,10 @@
   parent: OrganAnimalStomach
   name: Stomach
   description: "Gross. This is hard to stomach."
-  noSpawn: true
   components:
+  - type: Sprite
+    sprite: Mobs/Species/Arachnid/organs.rsi
+    state: stomach
   - type: Stomach
     updateInterval: 1.5
   - type: SolutionContainerManager
@@ -33,12 +35,42 @@
   - type: Metabolizer
     updateFrequency: 1.5
 
+- type: entity
+  id: OrganArachnidLungs
+  parent: BaseArachnidOrgan
+  name: lungs
+  description: "Filters oxygen from an atmosphere... just more greedily."
+  components:
+  - type: Sprite
+    layers:
+      - state: lung-l
+      - state: lung-r
+  - type: Organ
+  - type: Lung
+  - type: Metabolizer
+    updateFrequency: 1.5
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Human ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100.0
+        canReact: false
+
 - type: entity
   id: OrganArachnidHeart
-  parent: BaseHumanOrgan
+  parent: BaseArachnidOrgan
   name: heart
-  description: "I feel bad for the heartless bastard who lost this."
+  description: "A disgustingly persistent little biological pump made for spiders."
-  noSpawn: true
   components:
   - type: Sprite
     state: heart-on
@@ -93,7 +125,7 @@
   id: OrganArachnidEyes
   parent: BaseArachnidOrgan
   name: eyes
-  description: "Eyes see you!"
+  description: "Two was already too many."
   components:
   - type: Sprite
     layers:

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

@@ -1,3 +1,13 @@
+# Chelicerae
+- type: marking
+  id: ArachnidCheliceraeBasic
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chelicerae.rsi
+    state: basic
+
 # Appendages
 - type: marking
   id: ArachnidAppendagesDefault
@@ -5,9 +15,7 @@
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: web
-  - sprite: Mobs/Customization/arachnid.rsi
     state: long
 
 - type: marking
@@ -16,9 +24,7 @@
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: web
-  - sprite: Mobs/Customization/arachnid.rsi
     state: sharp
 
 - type: marking
@@ -27,9 +33,7 @@
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: web
-  - sprite: Mobs/Customization/arachnid.rsi
     state: stingers
 
 - type: marking
@@ -38,9 +42,7 @@
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: web
-  - sprite: Mobs/Customization/arachnid.rsi
     state: zigzag
 
 - type: marking
@@ -49,11 +51,36 @@
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: web
-  - sprite: Mobs/Customization/arachnid.rsi
     state: curled
 
+- type: marking
+  id: ArachnidAppendagesChipped
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: chipped
+
+- type: marking
+  id: ArachnidAppendagesHarvest
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: harvest
+
+- type: marking
+  id: ArachnidAppendagesShort
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: short
+
 # Chest
 - type: marking
   id: ArachnidTorsoStripes
@@ -61,7 +88,7 @@
   markingCategory: Chest
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
     state: stripes
 
 - type: marking
@@ -70,7 +97,7 @@
   markingCategory: Chest
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
     state: slashes
 
 - type: marking
@@ -79,7 +106,7 @@
   markingCategory: Chest
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
     state: x
 
 - type: marking
@@ -88,5 +115,41 @@
   markingCategory: Chest
   speciesRestriction: [Arachnid]
   sprites:
-  - sprite: Mobs/Customization/arachnid.rsi
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
     state: cross
+
+- type: marking
+  id: ArachnidTorsoHeart
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: heart
+
+- type: marking
+  id: ArachnidTorsoHourglass
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: hourglass
+
+- type: marking
+  id: ArachnidTorsoNailAndHammer
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: nail-and-hammer
+
+- type: marking
+  id: ArachnidTorsoStar
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: star

Resources/Prototypes/Species/arachnid.yml

@@ -58,7 +58,8 @@
       required: false
     HeadSide:
       points: 1
-      required: false
+      required: true
+      defaultMarkings: [ ArachnidCheliceraeBasic ]
     Chest:
       points: 1
       required: false

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

@@ -27,25 +27,21 @@
       "name": "zigzag",
       "directions": 4
     },
+    {
+      "name": "chipped",
+      "directions": 4
+    },
+    {
+      "name": "harvest",
+      "directions": 4
+    },
+    {
+      "name": "short",
+      "directions": 4
+    },
     {
       "name": "web",
       "directions": 4
-    },
-    {
-      "name": "stripes",
-      "directions": 4
-    },
-    {
-      "name": "slashes",
-      "directions": 4
-    },
-    {
-      "name": "x",
-      "directions": 4
-    },
-    {
-      "name": "cross",
-      "directions": 4
     }
   ]
 }

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

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

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

@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by PixelTheKermit (github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "stripes",
+      "directions": 4
+    },
+    {
+      "name": "slashes",
+      "directions": 4
+    },
+    {
+      "name": "x",
+      "directions": 4
+    },
+    {
+      "name": "cross",
+      "directions": 4
+    },
+    {
+      "name": "heart",
+      "directions": 4
+    },
+    {
+      "name": "hourglass",
+      "directions": 4
+    },
+    {
+      "name": "nail-and-hammer",
+      "directions": 4
+    },
+    {
+      "name": "star",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json

@@ -15,6 +15,35 @@
     },
     {
       "name": "tongue"
+    },
+    {
+      "name": "heart-on",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.6
+        ]
+      ]
+    },
+    {
+      "name": "heart-off"
+    },
+    {
+      "name": "lung-l"
+    },
+    {
+      "name": "lung-r"
+    },
+    {
+      "name": "muscle"
+    },
+    {
+      "name": "stomach"
+    },
+    {
+      "name": "web-gland"
     }
   ]
 }