tweaks

Resources/Prototypes/Procedural/salvage_factions.yml

@@ -98,7 +98,7 @@
       amount: 1
     prob: 0.1
   - entries:
-    - id: MobSyndicateNavalCommander
+    - id: MobSyndicateNavalOperator # Will replace it later with new mob
       amount: 1
     prob: 0.001
   configs:
@@ -138,7 +138,7 @@
       amount: 1
     prob: 0.1
   - entries:
-    - id: MobBloodCultistAscended
+    - id: MobBloodCultistPriest # Will replace it later with new mob
       amount: 1
     prob: 0.001
   configs:

Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml

@@ -0,0 +1,53 @@
+# Organs with boosted metabolizm
+- type: entity
+  id: OrganSyntheticHeart
+  parent: BaseHumanOrgan
+  name: synthetic heart
+  description: "Whirrs and pumps blood."
+  components:
+  - type: Sprite
+    state: heart-on
+  - type: Metabolizer
+    maxReagents: 4
+    metabolizerTypes: [Human]
+    groups:
+    - id: Medicine
+#    - id: Poison
+#    - id: Narcotic
+#    - id: Toxins
+
+- type: entity
+  id: OrganSyntheticLiver
+  parent: BaseHumanOrgan
+  name: synthetic liver
+  description: "Filters toxins from the bloodstream at higher rate than old 'ganic liver."
+  components:
+  - type: Sprite
+    state: liver
+  - type: Metabolizer
+    maxReagents: 5
+    metabolizerTypes: [Human]
+    groups:
+    - id: Alcohol
+      rateModifier: 10 # removes Alcohol fast
+    - id: Poison
+      rateModifier: 10 # removes Poison fast
+    - id: Narcotic
+      rateModifier: 10 # removes Narcotic fast
+    - id: Toxins
+      rateModifier: 20 # removes Toxins fast
+
+- type: entity
+  id: OrganSyntheticKidneys
+  parent: BaseHumanOrgan
+  name: synthetic kidneys
+  description: "Filters toxins from the bloodstream at higher rate than old 'ganic liver."
+  components:
+  - type: Sprite
+    layers:
+      - state: kidney-l
+      - state: kidney-r
+  - type: Metabolizer
+    maxReagents: 5
+    metabolizerTypes: [Human]
+    removeEmpty: true

Resources/Prototypes/_NF/Body/Prototypes/human_synthetic_organs.yml

@@ -0,0 +1,50 @@
+- type: body
+  parent: Human
+  id: HumanSyntheticOrgans
+  name: "human"
+  root: torso
+  slots:
+    head:
+      part: HeadHuman
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoHuman
+      connections:
+      - right_arm
+      - left_arm
+      - right_leg
+      - left_leg
+      organs:
+        heart: OrganSyntheticHeart
+        lungs: OrganHumanLungs
+        stomach: OrganHumanStomach
+        liver: OrganSyntheticLiver
+        kidneys: OrganSyntheticKidneys
+    right_arm:
+      part: RightArmHuman
+      connections:
+      - right_hand
+    left_arm:
+      part: LeftArmHuman
+      connections:
+      - left_hand
+    right_hand:
+      part: RightHandHuman
+    left_hand:
+      part: LeftHandHuman
+    right_leg:
+      part: RightLegHuman
+      connections:
+      - right_foot
+    left_leg:
+      part: LeftLegHuman
+      connections:
+      - left_foot
+    right_foot:
+      part: RightFootHuman
+    left_foot:
+      part: LeftFootHuman

Resources/Prototypes/_NF/Chemistry/metabolism_groups.yml

@@ -0,0 +1,3 @@
+# Not sure if it actually does something
+- type: metabolismGroup
+  id: Toxins

Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml

@@ -128,3 +128,20 @@
         Base: crit
       Dead:
         Base: dead
+
+- type: entity
+  save: false
+  id: MobPassiveRegen
+  abstract: true
+  components:
+  - type: PassiveDamage # Slight passive regen.
+    allowedStates:
+    - Alive
+    damageCap: 400
+    damage:
+      groups:
+        Brute: -1
+        Burn: -1
+        Airloss: -1
+        Toxin: -3
+        Genetic: -3

Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml

@@ -194,7 +194,9 @@
 - type: entity
   name: Blood Leech
   suffix: AI, Melee
-  parent: MobNonHumanHostileBase
+  parent:
+  - MobNonHumanHostileBase
+  - MobPassiveRegen
   id: MobBloodCultLeech
   components:
   - type: NpcFactionMember

Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml

@@ -5,6 +5,9 @@
   parent: MobHumanoidHostileBase
   id: MobSyndicateNavalBase
   components:
+  - type: Body
+    prototype: HumanSyntheticOrgans # New set of synthetic organs grants elevated resistance to toxins and poisons
+    requiredLegs: 2
   - type: NpcFactionMember
     factions:
       - Syndicate
@@ -239,7 +242,7 @@
     - type: MobThresholds
       thresholds:
         0: Alive
-        140: Dead # No crit state to ensure that mob explodes ASAP
+        100: Dead # No crit state to ensure that mob explodes ASAP
     - type: Stamina
       critThreshold: 500 # Extra hard to incapacitate and loot
     - type: AutoImplant

Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml

@@ -4,6 +4,7 @@
   abstract: true
   parent:
   - MobHumanoidHostileBase
+  - MobPassiveRegen
   id: MobWizFedlBase
   components:
   - type: NpcFactionMember