Organs and fixes

Resources/Prototypes/Body/Organs/shadowkin.yml

@@ -0,0 +1,110 @@
+- type: entity
+  id: OrganShadowkinBrain
+  parent: OrganHumanBrain
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: brain
+
+- type: entity
+  id: OrganShadowkinEyes
+  parent: OrganHumanEyes
+  description: I see beyond anything you ever will!
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: eyes
+
+- type: entity
+  id: OrganShadowkinEars
+  parent: OrganHumanEars
+  description: Hey, listen!
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: ears
+
+- type: entity
+  id: OrganShadowkinTongue
+  parent: OrganHumanTongue
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: tongue
+
+
+- type: entity
+  id: OrganShadowkinAppendix
+  parent: OrganHumanAppendix
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: appendix
+
+
+- type: entity
+  id: OrganShadowkinHeart
+  parent: OrganHumanHeart
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: heart
+  - type: Metabolizer
+    maxReagents: 2
+    metabolizerTypes: [Shadowkin]
+    groups:
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
+
+- type: entity
+  id: OrganShadowkinStomach
+  parent: OrganHumanStomach
+  description: '"Yummy!", says the stomach, although you are unable to hear it.'
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: stomach
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 40
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Metabolizer
+    maxReagents: 3
+    metabolizerTypes: [Shadowkin]
+    groups:
+    - id: Food
+    - id: Drink
+
+- type: entity
+  id: OrganShadowkinLiver
+  parent: OrganHumanLiver
+  description: "Live 'er? I hardly know 'er!"
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: liver
+  - type: Metabolizer
+    maxReagents: 1
+    metabolizerTypes: [Shadowkin]
+    groups:
+    - id: Alcohol
+      rateModifier: 0.1
+
+- type: entity
+  id: OrganShadowkinKidneys
+  parent: OrganHumanKidneys
+  description: Give the kid their knees back, please, this is the third time this week.
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+    state: kidneys
+  - type: Metabolizer
+    maxReagents: 5
+    metabolizerTypes: [Shadowkin]
+    removeEmpty: true

Resources/Prototypes/Body/Parts/shadowkin.yml

@@ -6,9 +6,9 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Mobs/Species/shadowkin.rsi
+      sprite: Mobs/Species/shadowkin/parts.rsi
     - type: Icon
-      sprite: Mobs/Species/shadowkin.rsi
+      sprite: Mobs/Species/shadowkin/parts.rsi
     - type: Damageable
       damageContainer: Biological
     - type: BodyPart

Resources/Prototypes/Body/Prototypes/shadowkin.yml

@@ -8,21 +8,20 @@
       connections:
       - torso
       organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
+        brain: OrganShadowkinBrain
+        eyes: OrganShadowkinEyes
     torso:
       part: TorsoShadowkin
       connections:
       - left arm
       - right arm
       - left leg
       - right leg
-      organs: # placeholders
-        heart: OrganHumanHeart
-        # lungs: OrganLungs
-        stomach: OrganHumanStomach
-        liver:  OrganHumanLiver
-        kidneys: OrganHumanKidneys
+      organs:
+        heart: OrganShadowkinHeart
+        stomach: OrganShadowkinStomach
+        liver:  OrganShadowkinLiver
+        kidneys: OrganShadowkinKidneys
     right arm:
       part: RightArmShadowkin
       connections:

Resources/Prototypes/Chemistry/metabolizer_types.yml

@@ -52,3 +52,7 @@
 - type: metabolizerType
   id: LiquorLifeline
   name: liquorlifeline
+
+- type: metabolizerType
+  id: Shadowkin
+  name: shadowkin

Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml

@@ -8,7 +8,7 @@
   - type: HumanoidAppearance
     species: Shadowkin
   - type: Icon
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: full
   - type: Body
     prototype: Shadowkin
@@ -65,7 +65,59 @@
         layer:
           - MobLayer
   - type: Sprite
+    netsync: false
+    noRot: true
+    drawdepth: Mobs
     scale: 0.85, 0.85
+    layers:
+      - map: ["enum.HumanoidVisualLayers.Chest"]
+      - map: ["enum.HumanoidVisualLayers.Head"]
+      - map: ["enum.HumanoidVisualLayers.Snout"]
+      - map: ["enum.HumanoidVisualLayers.Eyes"]
+        shader: unshaded
+      - map: ["enum.HumanoidVisualLayers.RArm"]
+      - map: ["enum.HumanoidVisualLayers.LArm"]
+      - map: ["enum.HumanoidVisualLayers.RLeg"]
+      - map: ["enum.HumanoidVisualLayers.LLeg"]
+      - shader: StencilClear
+        sprite: Mobs/Species/Human/parts.rsi
+        state: l_leg
+      - shader: StencilMask
+        map: ["enum.HumanoidVisualLayers.StencilMask"]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: full
+        visible: false
+      - map: ["enum.HumanoidVisualLayers.LFoot"]
+      - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["socks"]
+      - map: ["underpants"]
+      - map: ["undershirt"]
+      - map: ["jumpsuit"]
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
+      - map: ["id"]
+      - map: ["gloves"]
+      - map: ["shoes"]
+      - map: ["ears"]
+      - map: ["outerClothing"]
+      - map: ["eyes"]
+      - map: ["belt"]
+      - map: ["neck"]
+      - map: ["back"]
+      - map: ["enum.HumanoidVisualLayers.FacialHair"]
+      - map: ["enum.HumanoidVisualLayers.Hair"]
+      - map: ["enum.HumanoidVisualLayers.HeadSide"]
+      - map: ["enum.HumanoidVisualLayers.HeadTop"]
+      - map: ["mask"]
+      - map: ["head"]
+      - map: ["pocket1"]
+      - map: ["pocket2"]
+      - map: ["enum.HumanoidVisualLayers.Tail"]
   - type: MeleeWeapon
     soundHit:
       collection: AlienClaw
@@ -105,7 +157,7 @@
   components:
   - type: HumanoidAppearance
     species: Shadowkin
-  - type: Sprite # sprite again because we want different layer ordering
+  - type: Sprite
     netsync: false
     noRot: true
     drawdepth: Mobs
@@ -115,6 +167,7 @@
       - map: ["enum.HumanoidVisualLayers.Head"]
       - map: ["enum.HumanoidVisualLayers.Snout"]
       - map: ["enum.HumanoidVisualLayers.Eyes"]
+        shader: unshaded
       - map: ["enum.HumanoidVisualLayers.RArm"]
       - map: ["enum.HumanoidVisualLayers.LArm"]
       - map: ["enum.HumanoidVisualLayers.RLeg"]

Resources/Prototypes/Reagents/toxins.yml

@@ -512,6 +512,12 @@
           shouldHave: true
         reagent: Protein
         amount: 0.5
+      - !type:AdjustReagent
+        conditions:
+        - !type:OrganType
+          type: Shadowkin
+        reagent: Protein
+        amount: 0.5
 
 - type: reagent
   id: Allicin

Resources/Prototypes/Species/shadowkin.yml

@@ -91,89 +91,89 @@
 - type: humanoidBaseSprite
   id: MobShadowkinHead
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: head_m
 
 - type: humanoidBaseSprite
   id: MobShadowkinHeadMale
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: head_m
 
 - type: humanoidBaseSprite
   id: MobShadowkinHeadFemale
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: head_f
 
 - type: humanoidBaseSprite
   id: MobShadowkinTorso
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: torso_m
 
 - type: humanoidBaseSprite
   id: MobShadowkinTorsoMale
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: torso_m
 
 - type: humanoidBaseSprite
   id: MobShadowkinTorsoFemale
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: torso_f
 
 - type: humanoidBaseSprite
   id: MobShadowkinLLeg
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: l_leg
 
 - type: humanoidBaseSprite
   id: MobShadowkinLHand
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: l_hand
 
 - type: humanoidBaseSprite
   id: MobShadowkinEyes
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: eyes
 
 - type: humanoidBaseSprite
   id: MobShadowkinLArm
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: l_arm
 
 - type: humanoidBaseSprite
   id: MobShadowkinLFoot
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: l_foot
 
 - type: humanoidBaseSprite
   id: MobShadowkinRLeg
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: r_leg
 
 - type: humanoidBaseSprite
   id: MobShadowkinRHand
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: r_hand
 
 - type: humanoidBaseSprite
   id: MobShadowkinRArm
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: r_arm
 
 - type: humanoidBaseSprite
   id: MobShadowkinRFoot
   baseSprite:
-    sprite: Mobs/Species/shadowkin.rsi
+    sprite: Mobs/Species/shadowkin/parts.rsi
     state: r_foot

Resources/ServerInfo/Guidebook/Mobs/shadowkin.xml

@@ -16,7 +16,7 @@ Fluffy lil' guys.
 - Can travel to and from The Dark at will
 - Dims nearby lights when in the The Dark
 - When too low on energy, they may fall into a powerful sleep
-- Can "speak" in the Empathy chat (~), which only other Shadowkin can understand
+- Can "speak" in the Empathy, which only other Shadowkin can understand
 - Slightly less blunt damage
 - A bit more slash damage
 - Slightly more piercing damage