ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)

Co-authored-by: Jezithyr <Jezithyr@gmail.com>
2022-10-23 00:46:28 +02:00
parent 9a38736c3c
commit f323fb7644
140 changed files with 2478 additions and 2571 deletions
--- a/Resources/Prototypes/Body/Mechanisms/tests.yml
+++ b/Resources/Prototypes/Body/Mechanisms/tests.yml
@@ -1,23 +0,0 @@
- type: entity
-  id: MechanismEMPStriker
-  name: "EMP striker"
-  description: "When activated, this arm implant will apply a small EMP on the target of a physical strike for 10 watts per use."
-  noSpawn: true
-  components:
-  - type: Sprite
-  - type: Icon
-  - type: Mechanism
-    size: 4
-    compatibility: Universal
-
- type: entity
-  id: MechanismHonkModule
-  name: "HONK module 3000"
-  description: "Mandatory implant for all clowns after the Genevo Convention of 2459."
-  noSpawn: true
-  components:
-  - type: Sprite
-  - type: Icon
-  - type: Mechanism
-    size: 3
-    compatibility: Universal
--- a/Resources/Prototypes/Body/Organs/animal.yml
+++ b/Resources/Prototypes/Body/Organs/animal.yml
@@ -0,0 +1,90 @@
+- type: entity
+  id: BaseAnimalOrgan
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Organ
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Human/organs.rsi
+  - type: StaticPrice
+    price: 50
+
+
+- type: entity
+  id: OrganAnimalLungs
+  parent: BaseAnimalOrgan
+  name: lungs
+  noSpawn: true
+  components:
+  - type: Organ
+  - type: Lung
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+
+- type: entity
+  id: OrganAnimalStomach
+  parent: BaseAnimalOrgan
+  name: stomach
+  noSpawn: true
+  components:
+  - type: Organ
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 100
+  - type: Stomach
+    maxVolume: 10
+  - type: Metabolizer
+    maxReagents: 3
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Food
+    - id: Drink
+
+- type: entity
+  id: OrganAnimalLiver
+  parent: BaseAnimalOrgan
+  name: liver
+  noSpawn: true
+  components:
+  - type: Organ
+  - type: Metabolizer
+    maxReagents: 1
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Alcohol
+      rateModifier: 0.1
+
+- type: entity
+  id: OrganAnimalHeart
+  parent: BaseAnimalOrgan
+  name: heart
+  noSpawn: true
+  components:
+  - type: Organ
+  - type: Metabolizer
+    maxReagents: 2
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
+
+- type: entity
+  id: OrganAnimalKidneys
+  parent: BaseAnimalOrgan
+  name: kidneys
+  noSpawn: true
+  components:
+  - type: Organ
+  - type: Metabolizer
+    maxReagents: 5
+    metabolizerTypes: [ Animal ]
+    removeEmpty: true
--- a/Resources/Prototypes/Body/Mechanisms/human.yml
+++ b/Resources/Prototypes/Body/Mechanisms/human.yml
@@ -6,7 +6,7 @@
  - type: Sprite
    netsync: false
    sprite: Mobs/Species/Human/organs.rsi
-  - type: Mechanism
+  - type: Organ
  - type: Food
  - type: Extractable
    grindableSolutionName: organ
@@ -25,9 +25,7 @@
  components:
  - type: Sprite
    state: brain
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ
  - type: Input
    context: "ghost"
  - type: InputMover
@@ -47,9 +45,7 @@
    layers:
      - state: eyeball-l
      - state: eyeball-r
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ

 - type: entity
  id: OrganHumanTongue
@@ -59,9 +55,7 @@
  components:
  - type: Sprite
    state: tongue
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ

 - type: entity
  id: OrganHumanAppendix
@@ -73,9 +67,7 @@
    - state: appendix
    - state: appendix-inflamed
      visible: false
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ

 - type: entity
  id: OrganHumanEars
@@ -85,9 +77,7 @@
  components:
  - type: Sprite
    state: ears
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ

 - type: entity
  id: OrganHumanLungs
@@ -99,9 +89,7 @@
    layers:
      - state: lung-l
      - state: lung-r
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ
  - type: Lung
  - type: Metabolizer
    removeEmpty: true
@@ -120,9 +108,7 @@
  components:
  - type: Sprite
    state: heart-on
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ
  # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
  # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
  # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
@@ -142,9 +128,7 @@
  components:
  - type: Sprite
    state: stomach
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ
  - type: SolutionContainerManager
    solutions:
      stomach:
@@ -169,9 +153,7 @@
  components:
  - type: Sprite
    state: liver
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ
  - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
    maxReagents: 1
    metabolizerTypes: [Human]
@@ -189,9 +171,7 @@
    layers:
      - state: kidney-l
      - state: kidney-r
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ
  # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
  - type: Metabolizer
    maxReagents: 5
--- a/Resources/Prototypes/Body/Mechanisms/rat.yml
+++ b/Resources/Prototypes/Body/Mechanisms/rat.yml
--- a/Resources/Prototypes/Body/Mechanisms/reptilian.yml
+++ b/Resources/Prototypes/Body/Mechanisms/reptilian.yml
--- a/Resources/Prototypes/Body/Mechanisms/slime.yml
+++ b/Resources/Prototypes/Body/Mechanisms/slime.yml
@@ -8,9 +8,7 @@
      netsync: false
      sprite: Mobs/Species/Human/organs.rsi
      state: brain
-    - type: Mechanism
-      size: 5
-      compatibility: Slime
+    - type: Organ
    - type: Brain
    - type: Stomach
    - type: Metabolizer
@@ -34,9 +32,7 @@
    layers:
      - state: lung-l
      - state: lung-r
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
+  - type: Organ
  - type: Lung
  - type: Metabolizer
    removeEmpty: true
--- a/Resources/Prototypes/Body/Mechanisms/vox.yml
+++ b/Resources/Prototypes/Body/Mechanisms/vox.yml
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -27,8 +27,6 @@
  components:
  - type: BodyPart
    partType: Hand
-    size: 1
-    compatibility: Biological
    symmetry: Left

 - type: entity
@@ -39,8 +37,6 @@
  components:
  - type: BodyPart
    partType: Leg
-    size: 1
-    compatibility: Biological

 - type: entity
  id: FeetAnimal
@@ -50,8 +46,6 @@
  components:
  - type: BodyPart
    partType: Foot
-    size: 1
-    compatibility: Biological

 - type: entity
  id: TorsoAnimal
@@ -61,113 +55,5 @@
  components:
  - type: BodyPart
    partType: Torso
-    size: 7
-    compatibility: Biological
-    mechanisms:
-    - OrganAnimalLungs
-    - OrganAnimalStomach
-    - OrganAnimalLiver
-    - OrganAnimalHeart
-    - OrganAnimalKidneys
  - type: Damageable
    damageContainer: Biological
-
- type: entity
-  id: BaseAnimalOrgan
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Mechanism
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Human/organs.rsi
-  - type: StaticPrice
-    price: 50
-
- type: entity
-  id: OrganAnimalLungs
-  parent: BaseAnimalOrgan
-  name: lungs
-  noSpawn: true
-  components:
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
-  - type: Lung
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Animal ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
-
- type: entity
-  id: OrganAnimalStomach
-  parent: BaseAnimalOrgan
-  name: stomach
-  noSpawn: true
-  components:
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 100
-  - type: Stomach
-    maxVolume: 10
-  - type: Metabolizer
-    maxReagents: 3
-    metabolizerTypes: [Animal]
-    groups:
-    - id: Food
-    - id: Drink
-
- type: entity
-  id: OrganAnimalLiver
-  parent: BaseAnimalOrgan
-  name: liver
-  noSpawn: true
-  components:
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
-  - type: Metabolizer
-    maxReagents: 1
-    metabolizerTypes: [Animal]
-    groups:
-    - id: Alcohol
-      rateModifier: 0.1
-
- type: entity
-  id: OrganAnimalHeart
-  parent: BaseAnimalOrgan
-  name: heart
-  noSpawn: true
-  components:
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
-  - type: Metabolizer
-    maxReagents: 2
-    metabolizerTypes: [Animal]
-    groups:
-    - id: Medicine
-    - id: Poison
-    - id: Narcotic
-
- type: entity
-  id: OrganAnimalKidneys
-  parent: BaseAnimalOrgan
-  name: kidneys
-  noSpawn: true
-  components:
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
-  - type: Metabolizer
-    maxReagents: 5
-    metabolizerTypes: [Animal]
-    removeEmpty: true
--- a/Resources/Prototypes/Body/Parts/human.yml
+++ b/Resources/Prototypes/Body/Parts/human.yml
@@ -30,16 +30,6 @@
    state: "torso_m"
  - type: BodyPart
    partType: Torso
-    size: 14
-    compatibility: Biological
-    mechanisms:
-    - OrganHumanHeart
-    - OrganHumanLungs
-    - OrganHumanStomach
-    - OrganHumanLiver
-    - OrganHumanKidneys
-#    criticalThreshold: 100
-#    deadThreshold: 150

 - type: entity
  id: HeadHuman
@@ -55,14 +45,7 @@
    state: "head_m"
  - type: BodyPart
    partType: Head
-    size: 7
-    compatibility: Biological
    vital: true
-    mechanisms:
-    - OrganHumanBrain
-    - OrganHumanEyes
-#    criticalThreshold: 50
-#    deadThreshold: 120
  - type: Input
    context: "ghost"
  - type: MovementSpeedModifier
@@ -88,11 +71,7 @@
    state: "l_arm"
  - type: BodyPart
    partType: Arm
-    size: 5
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 40
-#    deadThreshold: 80

 - type: entity
  id: RightArmHuman
@@ -108,11 +87,7 @@
    state: "r_arm"
  - type: BodyPart
    partType: Arm
-    size: 5
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 40
-#    deadThreshold: 80

 - type: entity
  id: LeftHandHuman
@@ -128,11 +103,7 @@
    state: "l_hand"
  - type: BodyPart
    partType: Hand
-    size: 3
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: RightHandHuman
@@ -148,11 +119,7 @@
    state: "r_hand"
  - type: BodyPart
    partType: Hand
-    size: 3
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: LeftLegHuman
@@ -168,11 +135,7 @@
    state: "l_leg"
  - type: BodyPart
    partType: Leg
-    size: 6
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 45
-#    deadThreshold: 90

 - type: entity
  id: RightLegHuman
@@ -188,11 +151,7 @@
    state: "r_leg"
  - type: BodyPart
    partType: Leg
-    size: 6
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 45
-#    deadThreshold: 90

 - type: entity
  id: LeftFootHuman
@@ -208,11 +167,7 @@
    state: "l_foot"
  - type: BodyPart
    partType: Foot
-    size: 2
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: RightFootHuman
@@ -228,8 +183,4 @@
    state: "r_foot"
  - type: BodyPart
    partType: Foot
-    size: 2
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 30
-#    deadThreshold: 60
--- a/Resources/Prototypes/Body/Parts/rat.yml
+++ b/Resources/Prototypes/Body/Parts/rat.yml
@@ -8,13 +8,5 @@
  components:
  - type: BodyPart
    partType: Torso
-    size: 7
-    compatibility: Biological
-    mechanisms:
-    - OrganRatLungs
-    - OrganRatStomach
-    - OrganAnimalLiver
-    - OrganAnimalHeart
-    - OrganAnimalKidneys
  - type: Damageable
    damageContainer: Biological
--- a/Resources/Prototypes/Body/Parts/reptilian.yml
+++ b/Resources/Prototypes/Body/Parts/reptilian.yml
@@ -28,16 +28,6 @@
    state: "torso_m"
  - type: BodyPart
    partType: Torso
-    size: 14
-    compatibility: Biological
-    mechanisms:
-    - OrganAnimalHeart
-    - OrganHumanLungs
-    - OrganReptilianStomach
-    - OrganAnimalLiver
-    - OrganHumanKidneys
-#    criticalThreshold: 100
-#    deadThreshold: 150

 - type: entity
  id: HeadReptilian
@@ -53,14 +43,7 @@
    state: "head_m"
  - type: BodyPart
    partType: Head
-    size: 7
-    compatibility: Biological
    vital: true
-    mechanisms:
-    - OrganHumanBrain
-    - OrganHumanEyes
-#    criticalThreshold: 50
-#    deadThreshold: 120
  - type: Input
    context: "ghost"
  - type: MovementSpeedModifier
@@ -86,11 +69,7 @@
    state: "l_arm"
  - type: BodyPart
    partType: Arm
-    size: 5
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 40
-#    deadThreshold: 80

 - type: entity
  id: RightArmReptilian
@@ -106,11 +85,7 @@
    state: "r_arm"
  - type: BodyPart
    partType: Arm
-    size: 5
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 40
-#    deadThreshold: 80

 - type: entity
  id: LeftHandReptilian
@@ -126,11 +101,7 @@
    state: "l_hand"
  - type: BodyPart
    partType: Hand
-    size: 3
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: RightHandReptilian
@@ -146,11 +117,7 @@
    state: "r_hand"
  - type: BodyPart
    partType: Hand
-    size: 3
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: LeftLegReptilian
@@ -166,11 +133,7 @@
    state: "l_leg"
  - type: BodyPart
    partType: Leg
-    size: 6
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 45
-#    deadThreshold: 90

 - type: entity
  id: RightLegReptilian
@@ -186,11 +149,7 @@
    state: "r_leg"
  - type: BodyPart
    partType: Leg
-    size: 6
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 45
-#    deadThreshold: 90

 - type: entity
  id: LeftFootReptilian
@@ -206,11 +165,7 @@
    state: "l_foot"
  - type: BodyPart
    partType: Foot
-    size: 2
-    compatibility: Biological
    symmetry: Left
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: RightFootReptilian
@@ -226,8 +181,4 @@
    state: "r_foot"
  - type: BodyPart
    partType: Foot
-    size: 2
-    compatibility: Biological
    symmetry: Right
-#    criticalThreshold: 30
-#    deadThreshold: 60
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -28,8 +28,6 @@
    state: "l_hand"
  - type: BodyPart
    partType: Hand
-    size: 3
-    compatibility: Biological ##Does this do anything? Revisit when surgery is in
    symmetry: Left
  - type: Tag
    tags:
@@ -51,8 +49,6 @@
    state: "r_hand"
  - type: BodyPart
    partType: Hand
-    size: 3
-    compatibility: Biological
    symmetry: Right
  - type: Tag
    tags:
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -29,8 +29,6 @@
      state: "torso_m"
    - type: BodyPart
      partType: Torso
-      size: 14
-      compatibility: Biological

 - type: entity
  id: HeadSkeleton
@@ -47,8 +45,6 @@
      state: "skull_icon"
    - type: BodyPart
      partType: Head
-      size: 7
-      compatibility: Biological
    - type: Input
      context: "human"
    - type: MovementSpeedModifier
@@ -88,8 +84,6 @@
      state: "l_arm"
    - type: BodyPart
      partType: Arm
-      size: 5
-      compatibility: Biological
      symmetry: Left

 - type: entity
@@ -106,8 +100,6 @@
      state: "r_arm"
    - type: BodyPart
      partType: Arm
-      size: 5
-      compatibility: Biological
      symmetry: Right

 - type: entity
@@ -124,8 +116,6 @@
      state: "l_hand"
    - type: BodyPart
      partType: Hand
-      size: 3
-      compatibility: Biological
      symmetry: Left

 - type: entity
@@ -142,8 +132,6 @@
      state: "r_hand"
    - type: BodyPart
      partType: Hand
-      size: 3
-      compatibility: Biological
      symmetry: Right

 - type: entity
@@ -160,7 +148,7 @@
      state: "l_leg"
    - type: BodyPart
      partType: Leg
-      size: 6
+      symmetry: Left

 - type: entity
  id: RightLegSkeleton
@@ -176,8 +164,6 @@
      state: "r_leg"
    - type: BodyPart
      partType: Leg
-      size: 6
-      compatibility: Biological
      symmetry: Right

 - type: entity
@@ -194,8 +180,6 @@
      state: "l_foot"
    - type: BodyPart
      partType: Foot
-      size: 2
-      compatibility: Biological
      symmetry: Left

 - type: entity
@@ -212,6 +196,4 @@
      state: "r_foot"
    - type: BodyPart
      partType: Foot
-      size: 2
-      compatibility: Biological
-      symmetry: Right
+      symmetry: Right
--- a/Resources/Prototypes/Body/Parts/slime.yml
+++ b/Resources/Prototypes/Body/Parts/slime.yml
@@ -29,13 +29,6 @@
      state: "torso_m"
    - type: BodyPart
      partType: Torso
-      size: 14
-      compatibility: Slime
-      mechanisms:
-        - SentientSlimeCore
-        - OrganSlimeLungs
-#    criticalThreshold: 100
-#    deadThreshold: 150

 - type: entity
  id: HeadSlime
@@ -51,11 +44,7 @@
      state: "head_m"
    - type: BodyPart
      partType: Head
-      size: 7
-      compatibility: Slime
      vital: true
-    #    criticalThreshold: 50
-    #    deadThreshold: 120
    - type: Input
      context: "ghost"
    - type: MovementSpeedModifier
@@ -81,11 +70,7 @@
      state: "l_arm"
    - type: BodyPart
      partType: Arm
-      size: 5
-      compatibility: Slime
      symmetry: Left
-    #    criticalThreshold: 40
-    #    deadThreshold: 80

 - type: entity
  id: RightArmSlime
@@ -101,11 +86,7 @@
      state: "r_arm"
    - type: BodyPart
      partType: Arm
-      size: 5
-      compatibility: Slime
      symmetry: Right
-    #    criticalThreshold: 40
-    #    deadThreshold: 80

 - type: entity
  id: LeftHandSlime
@@ -121,11 +102,7 @@
      state: "l_hand"
    - type: BodyPart
      partType: Hand
-      size: 3
-      compatibility: Slime
      symmetry: Left
-    #    criticalThreshold: 30
-    #    deadThreshold: 60

 - type: entity
  id: RightHandSlime
@@ -141,11 +118,7 @@
      state: "r_hand"
    - type: BodyPart
      partType: Hand
-      size: 3
-      compatibility: Slime
      symmetry: Right
-    #    criticalThreshold: 30
-    #    deadThreshold: 60

 - type: entity
  id: LeftLegSlime
@@ -161,8 +134,6 @@
      state: "l_leg"
    - type: BodyPart
      partType: Leg
-      size: 6
-      compatibility: Slime
      symmetry: Left

 - type: entity
@@ -179,11 +150,7 @@
      state: "r_leg"
    - type: BodyPart
      partType: Leg
-      size: 6
-      compatibility: Slime
      symmetry: Right
-    #    criticalThreshold: 45
-    #    deadThreshold: 90

 - type: entity
  id: LeftFootSlime
@@ -199,11 +166,7 @@
      state: "l_foot"
    - type: BodyPart
      partType: Foot
-      size: 2
-      compatibility: Slime
      symmetry: Left
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: RightFootSlime
@@ -219,8 +182,4 @@
      state: "r_foot"
    - type: BodyPart
      partType: Foot
-      size: 2
-      compatibility: Slime
      symmetry: Right
-#    criticalThreshold: 30
-#    deadThreshold: 60
--- a/Resources/Prototypes/Body/Parts/vox.yml
+++ b/Resources/Prototypes/Body/Parts/vox.yml
@@ -30,17 +30,6 @@
      state: "torso_m"
    - type: BodyPart
      partType: Torso
-      size: 14
-      compatibility: Biological
-      mechanisms:
-        - OrganHumanHeart
-        - OrganVoxLungs
-        - OrganHumanStomach
-        - OrganHumanLiver
-        - OrganHumanKidneys
-      # TODO BODY DettachableDamageableComponent?
-#    criticalThreshold: 100
-#    deadThreshold: 150

 - type: entity
  id: HeadVox
@@ -56,14 +45,7 @@
      state: "head_m"
    - type: BodyPart
      partType: Head
-      size: 7
-      compatibility: Biological
      vital: true
-      mechanisms:
-        - OrganHumanBrain
-        - OrganHumanEyes
-    #    criticalThreshold: 50
-    #    deadThreshold: 120
    - type: Input
      context: "ghost"
    - type: MovementSpeedModifier
@@ -89,11 +71,7 @@
      state: "l_arm"
    - type: BodyPart
      partType: Arm
-      size: 5
-      compatibility: Biological
      symmetry: Left
-    #    criticalThreshold: 40
-    #    deadThreshold: 80

 - type: entity
  id: RightArmVox
@@ -109,11 +87,7 @@
      state: "r_arm"
    - type: BodyPart
      partType: Arm
-      size: 5
-      compatibility: Biological
      symmetry: Right
-    #    criticalThreshold: 40
-    #    deadThreshold: 80

 - type: entity
  id: LeftHandVox
@@ -129,11 +103,7 @@
      state: "l_hand"
    - type: BodyPart
      partType: Hand
-      size: 3
-      compatibility: Biological
      symmetry: Left
-    #    criticalThreshold: 30
-    #    deadThreshold: 60

 - type: entity
  id: RightHandVox
@@ -149,11 +119,7 @@
      state: "r_hand"
    - type: BodyPart
      partType: Hand
-      size: 3
-      compatibility: Biological
      symmetry: Right
-    #    criticalThreshold: 30
-    #    deadThreshold: 60

 - type: entity
  id: LeftLegVox
@@ -169,11 +135,7 @@
      state: "l_leg"
    - type: BodyPart
      partType: Leg
-      size: 6
-      compatibility: Biological
      symmetry: Left
-    #    criticalThreshold: 45
-    #    deadThreshold: 90

 - type: entity
  id: RightLegVox
@@ -189,11 +151,7 @@
      state: "r_leg"
    - type: BodyPart
      partType: Leg
-      size: 6
-      compatibility: Biological
      symmetry: Right
-    #    criticalThreshold: 45
-    #    deadThreshold: 90

 - type: entity
  id: LeftFootVox
@@ -209,11 +167,7 @@
      state: "l_foot"
    - type: BodyPart
      partType: Foot
-      size: 2
-      compatibility: Biological
      symmetry: Left
-#    criticalThreshold: 30
-#    deadThreshold: 60

 - type: entity
  id: RightFootVox
@@ -229,8 +183,4 @@
      state: "r_foot"
    - type: BodyPart
      partType: Foot
-      size: 2
-      compatibility: Biological
      symmetry: Right
-#    criticalThreshold: 30
-#    deadThreshold: 60
--- a/Resources/Prototypes/Body/Presets/animal.yml
+++ b/Resources/Prototypes/Body/Presets/animal.yml
@@ -1,7 +0,0 @@
- type: bodyPreset
-  name: "animal preset"
-  id: AnimalPreset
-  partIDs:
-    legs: LegsAnimal
-    feet: FeetAnimal
-    torso: TorsoAnimal
--- a/Resources/Prototypes/Body/Presets/bot.yml
+++ b/Resources/Prototypes/Body/Presets/bot.yml
@@ -1,5 +0,0 @@
- type: bodyPreset
-  name: "bot"
-  id: BotPreset
-  partIDs:
-    hand 1: LeftArmBorg
--- a/Resources/Prototypes/Body/Presets/drone.yml
+++ b/Resources/Prototypes/Body/Presets/drone.yml
@@ -1,10 +0,0 @@
- type: bodyPreset
-  name: "drone"
-  id: DronePreset
-  partIDs:
-    hand 1: LeftArmBorg
-    hand 2: LeftArmBorg
-    hand 3: LeftArmBorg
-    hand 4: LeftArmBorg
-    hand 5: RightArmBorg
-    hand 6: RightArmBorg
--- a/Resources/Prototypes/Body/Presets/human.yml
+++ b/Resources/Prototypes/Body/Presets/human.yml
@@ -1,14 +0,0 @@
- type: bodyPreset
-  name: "human"
-  id: HumanPreset
-  partIDs:
-    head: HeadHuman
-    torso: TorsoHuman
-    right arm: RightArmHuman
-    left arm: LeftArmHuman
-    right hand: RightHandHuman
-    left hand: LeftHandHuman
-    right leg: RightLegHuman
-    left leg: LeftLegHuman
-    right foot: RightFootHuman
-    left foot: LeftFootHuman
--- a/Resources/Prototypes/Body/Presets/primate.yml
+++ b/Resources/Prototypes/Body/Presets/primate.yml
@@ -1,8 +0,0 @@
- type: bodyPreset
-  name: "primate preset"
-  id: PrimatePreset
-  partIDs:
-    hands: HandsAnimal
-    legs: LegsAnimal
-    feet: FeetAnimal
-    torso: TorsoAnimal
--- a/Resources/Prototypes/Body/Presets/rat.yml
+++ b/Resources/Prototypes/Body/Presets/rat.yml
@@ -1,7 +0,0 @@
- type: bodyPreset
-  name: "animal preset"
-  id: RatPreset
-  partIDs:
-    legs: LegsAnimal
-    feet: FeetAnimal
-    torso: TorsoRat
--- a/Resources/Prototypes/Body/Presets/reptilian.yml
+++ b/Resources/Prototypes/Body/Presets/reptilian.yml
@@ -1,14 +0,0 @@
- type: bodyPreset
-  name: "reptilian"
-  id: ReptilianPreset
-  partIDs:
-    head: HeadReptilian
-    torso: TorsoReptilian
-    right arm: RightArmReptilian
-    left arm: LeftArmReptilian
-    right hand: RightHandReptilian
-    left hand: LeftHandReptilian
-    right leg: RightLegReptilian
-    left leg: LeftLegReptilian
-    right foot: RightFootReptilian
-    left foot: LeftFootReptilian
--- a/Resources/Prototypes/Body/Presets/skeleton.yml
+++ b/Resources/Prototypes/Body/Presets/skeleton.yml
@@ -1,14 +0,0 @@
- type: bodyPreset
-  name: "skeleton"
-  id: SkeletonPreset
-  partIDs:
-    head: HeadSkeleton
-    torso: TorsoSkeleton
-    right arm: RightArmSkeleton
-    left arm: LeftArmSkeleton
-    right hand: RightHandSkeleton
-    left hand: LeftHandSkeleton
-    right leg: RightLegSkeleton
-    left leg: LeftLegSkeleton
-    right foot: RightFootSkeleton
-    left foot: LeftFootSkeleton
--- a/Resources/Prototypes/Body/Presets/slime.yml
+++ b/Resources/Prototypes/Body/Presets/slime.yml
@@ -1,14 +0,0 @@
- type: bodyPreset
-  name: "slime"
-  id: SlimePreset
-  partIDs:
-    head: HeadSlime
-    torso: TorsoSlime
-    right arm: RightArmSlime
-    left arm: LeftArmSlime
-    right hand: RightHandSlime
-    left hand: LeftHandSlime
-    right leg: RightLegSlime
-    left leg: LeftLegSlime
-    right foot: RightFootSlime
-    left foot: LeftFootSlime
--- a/Resources/Prototypes/Body/Presets/vox.yml
+++ b/Resources/Prototypes/Body/Presets/vox.yml
@@ -1,14 +0,0 @@
- type: bodyPreset
-  name: "vox"
-  id: VoxPreset
-  partIDs:
-    head: HeadVox
-    torso: TorsoVox
-    right arm: RightArmVox
-    left arm: LeftArmVox
-    right hand: RightHandVox
-    left hand: LeftHandVox
-    right leg: RightLegVox
-    left leg: LeftLegVox
-    right foot: RightFootVox
-    left foot: LeftFootVox
--- a/Resources/Prototypes/Body/Prototypes/a_ghost.yml
+++ b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
@@ -0,0 +1,22 @@
+- type: body
+  id: Aghost
+  name: "aGhost"
+  root: torso
+  slots:
+    torso:
+      part: TorsoHuman
+      connections:
+      - right arm
+      - left arm
+    right arm:
+      part: RightArmHuman
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmHuman
+      connections:
+      - left hand
+    right hand:
+      part: RightHandHuman
+    left hand:
+      part: LeftHandHuman
--- a/Resources/Prototypes/Body/Prototypes/animal.yml
+++ b/Resources/Prototypes/Body/Prototypes/animal.yml
@@ -0,0 +1,21 @@
+- type: body
+  id: Animal
+  name: "animal"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
--- a/Resources/Prototypes/Body/Prototypes/bot.yml
+++ b/Resources/Prototypes/Body/Prototypes/bot.yml
@@ -0,0 +1,7 @@
+- type: body
+  id: Bot
+  name: "bot"
+  root: hand 1
+  slots:
+    hand 1:
+      part: LeftArmBorg
--- a/Resources/Prototypes/Body/Prototypes/drone.yml
+++ b/Resources/Prototypes/Body/Prototypes/drone.yml
@@ -0,0 +1,27 @@
+- type: body
+  id: Drone
+  name: "drone"
+  root: hand 1
+  slots:
+    hand 1:
+      part: LeftArmBorg
+      connections:
+      - hand 2
+    hand 2:
+      part: LeftArmBorg
+      connections:
+      - hand 3
+    hand 3:
+      part: LeftArmBorg
+      connections:
+      - hand 4
+    hand 4:
+      part: LeftArmBorg
+      connections:
+      - hand 5
+    hand 5:
+      part: RightArmBorg
+      connections:
+      - hand 6
+    hand 6:
+      part: RightArmBorg
--- a/Resources/Prototypes/Body/Prototypes/human.yml
+++ b/Resources/Prototypes/Body/Prototypes/human.yml
@@ -0,0 +1,49 @@
+- type: body
+  id: Human
+  name: "human"
+  root: torso
+  slots:
+    head:
+      part: HeadHuman
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoHuman
+      connections:
+      - left arm
+      - right arm
+      - left leg
+      - right leg
+      organs:
+        heart: OrganHumanHeart
+        lungs: OrganHumanLungs
+        stomach: OrganHumanStomach
+        liver: OrganHumanLiver
+        kidneys: OrganHumanKidneys
+    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
--- a/Resources/Prototypes/Body/Prototypes/primate.yml
+++ b/Resources/Prototypes/Body/Prototypes/primate.yml
@@ -0,0 +1,24 @@
+- type: body
+  id: Primate
+  name: "primate"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - hands
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    hands:
+      part: HandsAnimal
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
--- a/Resources/Prototypes/Body/Prototypes/rat.yml
+++ b/Resources/Prototypes/Body/Prototypes/rat.yml
@@ -0,0 +1,21 @@
+- type: body
+  id: Rat
+  name: "animal"
+  root: torso
+  slots:
+    torso:
+      part: TorsoRat
+      connections:
+      - legs
+      organs:
+        lungs: OrganRatLungs
+        stomach: OrganRatStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
--- a/Resources/Prototypes/Body/Prototypes/reptilian.yml
+++ b/Resources/Prototypes/Body/Prototypes/reptilian.yml
@@ -0,0 +1,49 @@
+- type: body
+  name: "reptilian"
+  id: Reptilian
+  root: torso
+  slots:
+    head:
+      part: HeadReptilian
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoReptilian
+      organs:
+        heart: OrganAnimalHeart
+        lungs: OrganHumanLungs
+        stomach: OrganReptilianStomach
+        liver: OrganAnimalLiver
+        kidneys: OrganHumanKidneys
+      connections:
+      - left arm
+      - right arm
+      - left leg
+      - right leg
+    right arm:
+      part: RightArmReptilian
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmReptilian
+      connections:
+      - left hand
+    right hand:
+      part: RightHandReptilian
+    left hand:
+      part: LeftHandReptilian
+    right leg:
+      part: RightLegReptilian
+      connections:
+      - right foot
+    left leg:
+      part: LeftLegReptilian
+      connections:
+      - left foot
+    right foot:
+      part: RightFootReptilian
+    left foot:
+      part: LeftFootReptilian
--- a/Resources/Prototypes/Body/Prototypes/skeleton.yml
+++ b/Resources/Prototypes/Body/Prototypes/skeleton.yml
@@ -0,0 +1,40 @@
+- type: body
+  id: Skeleton
+  name: "skeleton"
+  root: torso
+  slots:
+    head:
+      part: HeadSkeleton
+      connections:
+      - torso
+    torso:
+      part: TorsoSkeleton
+      connections:
+      - left arm
+      - right arm
+      - left leg
+      - right leg
+    right arm:
+      part: RightArmSkeleton
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmSkeleton
+      connections:
+      - left hand
+    right hand:
+      part: RightHandSkeleton
+    left hand:
+      part: LeftHandSkeleton
+    right leg:
+      part: RightLegSkeleton
+      connections:
+      - right foot
+    left leg:
+      part: LeftLegSkeleton
+      connections:
+      - left foot
+    right foot:
+      part: RightFootSkeleton
+    left foot:
+      part: LeftFootSkeleton
--- a/Resources/Prototypes/Body/Prototypes/slime.yml
+++ b/Resources/Prototypes/Body/Prototypes/slime.yml
@@ -0,0 +1,43 @@
+- type: body
+  id: Slime
+  name: "slime"
+  root: torso
+  slots:
+    head:
+      part: HeadSlime
+      connections:
+      - torso
+    torso:
+      part: TorsoSlime
+      connections:
+      - left arm
+      - right arm
+      - left leg
+      - right leg
+      organs:
+        core: SentientSlimeCore
+        lungs: OrganSlimeLungs
+    right arm:
+      part: RightArmSlime
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmSlime
+      connections:
+      - left hand
+    right hand:
+      part: RightHandSlime
+    left hand:
+      part: LeftHandSlime
+    right leg:
+      part: RightLegSlime
+      connections:
+      - right foot
+    left leg:
+      part: LeftLegSlime
+      connections:
+      - left foot
+    right foot:
+      part: RightFootSlime
+    left foot:
+      part: LeftFootSlime
--- a/Resources/Prototypes/Body/Prototypes/vox.yml
+++ b/Resources/Prototypes/Body/Prototypes/vox.yml
@@ -0,0 +1,49 @@
+- type: body
+  id: Vox
+  name: "vox"
+  root: torso
+  slots:
+    head:
+      part: HeadVox
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoVox
+      connections:
+      - left arm
+      - right arm
+      - left leg
+      - right leg
+      organs:
+        heart: OrganHumanHeart
+        lungs: OrganVoxLungs
+        stomach: OrganHumanStomach
+        liver: OrganHumanLiver
+        kidneys: OrganHumanKidneys
+    right arm:
+      part: RightArmVox
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmVox
+      connections:
+      - left hand
+    right hand:
+      part: RightHandVox
+    left hand:
+      part: LeftHandVox
+    right leg:
+      part: RightLegVox
+      connections:
+      - right foot
+    left leg:
+      part: LeftLegVox
+      connections:
+      - left foot
+    right foot:
+      part: RightFootVox
+    left foot:
+      part: LeftFootVox
--- a/Resources/Prototypes/Body/Templates/aghost.yml
+++ b/Resources/Prototypes/Body/Templates/aghost.yml
@@ -1,14 +0,0 @@
- type: bodyTemplate
-  id: AGhostTemplate
-  name: "humanoid"
-  centerSlot: "torso"
-  slots:
-    left arm: Arm
-    left hand: Hand
-    right arm: Arm
-    right hand: Hand
-  connections:
-    left arm:
-    - left hand
-    right arm:
-    - right hand
--- a/Resources/Prototypes/Body/Templates/animal.yml
+++ b/Resources/Prototypes/Body/Templates/animal.yml
@@ -1,14 +0,0 @@
-# I know I've skipped few parts
- type: bodyTemplate
-  id: AnimalTemplate
-  name: "animal template"
-  centerSlot: "torso"
-  slots:
-    torso: Torso
-    legs: Leg
-    feet: Foot
-  connections:
-    torso:
-    - legs
-    legs: 
-    - feet
--- a/Resources/Prototypes/Body/Templates/bot.yml
+++ b/Resources/Prototypes/Body/Templates/bot.yml
@@ -1,6 +0,0 @@
- type: bodyTemplate
-  id: BotTemplate
-  name: "bot"
-  centerSlot: "torso"
-  slots:
-    hand 1: hand
--- a/Resources/Prototypes/Body/Templates/drone.yml
+++ b/Resources/Prototypes/Body/Templates/drone.yml
@@ -1,11 +0,0 @@
- type: bodyTemplate
-  id: DroneTemplate
-  name: "drone"
-  centerSlot: "torso"
-  slots:
-    hand 1: hand
-    hand 2: hand
-    hand 3: hand
-    hand 4: hand
-    hand 5: hand
-    hand 6: hand
--- a/Resources/Prototypes/Body/Templates/humanoid.yml
+++ b/Resources/Prototypes/Body/Templates/humanoid.yml
@@ -1,31 +0,0 @@
- type: bodyTemplate
-  id: HumanoidTemplate
-  name: "humanoid"
-  centerSlot: "torso"
-  slots:
-    head: Head
-    torso: Torso
-    left arm: Arm
-    left hand: Hand
-    right arm: Arm
-    right hand: Hand
-    left leg: Leg
-    left foot: Foot
-    right leg: Leg
-    right foot: Foot
-  connections:
-    head:
-    - torso
-    torso:
-    - left arm
-    - right arm
-    - left leg
-    - right leg
-    left arm:
-    - left hand
-    right arm:
-    - right hand
-    left leg:
-    - left foot
-    right leg:
-    - right foot
--- a/Resources/Prototypes/Body/Templates/primate.yml
+++ b/Resources/Prototypes/Body/Templates/primate.yml
@@ -1,16 +0,0 @@
-# I know I've skipped few parts
- type: bodyTemplate
-  id: PrimateTemplate
-  name: "primate template"
-  centerSlot: "torso"
-  slots:
-    torso: Torso
-    hands: Hand
-    legs: Leg
-    feet: Foot
-  connections:
-    torso:
-    - hands
-    - legs
-    legs: 
-    - feet
--- a/Resources/Prototypes/Body/Templates/quadrupedal.yml
+++ b/Resources/Prototypes/Body/Templates/quadrupedal.yml
@@ -1,31 +0,0 @@
- type: bodyTemplate
-  id: QuadrupedalTemplate
-  name: "quadrupedal"
-  centerSlot: "torso"
-  slots:
-    head: Head
-    torso: Torso
-    left front leg: Leg
-    left front paw: Foot
-    right front leg: Leg
-    right front paw: Foot
-    left hind leg: Leg
-    left hind paw: Foot
-    right hind leg: Leg
-    right hind paw: Foot
-  connections:
-    head:
-    - torso
-    torso:
-    - left front leg
-    - right front leg
-    - left hind leg
-    - right hind paw
-    left front leg:
-    - left front paw
-    right front leg:
-    - right front paw
-    left hind leg:
-    - left hind paw
-    right hind leg:
-    - right hind paw