Makes organs consumable (#3754)

* Slightly reorganizes Body yaml

* Slightly reorganizes Body yaml

* You can now monch all organs

* Rewrites Mobs/Species/.rsi meta.jsons and replaces some human organ sprites

* ReIDs organs and does some more cleanup

Resources/Prototypes/Body/Mechanisms/human.yml

@@ -1,30 +1,29 @@
-- type: entity
-  id: BaseMechanism
-  parent: BaseItem
-  name: "base mechanism"
-  abstract: true
-  components:
-    - type: Mechanism
-
 - type: entity
   id: BaseHumanOrgan
-  parent: BaseMechanism
-  name: "base human organ"
+  parent: BaseItem
   abstract: true
   components:
-    - type: Sprite
-      netsync: false
-      sprite: Mobs/Species/Human/organs.rsi
-
-- type: entity
-  id: BrainHuman
-  parent: BaseHumanOrgan
-  name: "human brain"
-  description: "The source of incredible, unending intelligence. Honk."
-  components:
+  - type: Tag
+    tags:
+    - Grindable
   - type: Sprite
     netsync: false
     sprite: Mobs/Species/Human/organs.rsi
+  - type: Mechanism
+  - type: Food
+  - type: SolutionContainer
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 10
+
+- type: entity
+  id: OrganHumanBrain
+  parent: BaseHumanOrgan
+  name: brain
+  description: "The source of incredible, unending intelligence. Honk."
+  components:
+  - type: Sprite
     state: brain
   - type: Mechanism
     size: 1
@@ -37,28 +36,26 @@
   - type: GhostOnMove
 
 - type: entity
-  id: EyesHuman
+  id: OrganHumanEyes
   parent: BaseHumanOrgan
-  name: "human eyes"
-  description: "Ocular organ capable of turning light into a colorful visual."
+  name: eyes
+  description: "I see you!"
   components:
   - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Human/organs.rsi
-    state: eyeballs
+    layers:
+      - state: eyeball-l
+      - state: eyeball-r
   - type: Mechanism
     size: 1
     compatibility: Biological
 
 - type: entity
-  id: HeartHuman
+  id: OrganHumanHeart
   parent: BaseHumanOrgan
-  name: "human heart"
-  description: "Pumps blood throughout a body. Essential for any entity with blood."
+  name: heart
+  description: "I feel bad for the heartless bastard who lost this."
   components:
   - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Human/organs.rsi
     state: heart-on
   - type: Mechanism
     size: 1
@@ -67,15 +64,27 @@
     - !type:HeartBehavior {}
 
 - type: entity
-  id: LungsHuman
+  id: OrganHumanEars
   parent: BaseHumanOrgan
-  name: "human lungs"
+  name: ears
+  description: "There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible."
+  components:
+  - type: Sprite
+    state: ears
+  - type: Mechanism
+    size: 1
+    compatibility: Biological
+
+- type: entity
+  id: OrganHumanLungs
+  parent: BaseHumanOrgan
+  name: lungs
   description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
   components:
   - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Human/organs.rsi
-    state: lungs
+    layers:
+      - state: lung-l
+      - state: lung-r
   - type: Mechanism
     size: 1
     compatibility: Biological
@@ -83,14 +92,12 @@
     - !type:LungBehavior {}
 
 - type: entity
-  id: StomachHuman
+  id: OrganHumanStomach
   parent: BaseHumanOrgan
-  name: "human stomach"
+  name: stomach
   description: "Gross. This is hard to stomach."
   components:
   - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Human/organs.rsi
     state: stomach
   - type: Mechanism
     size: 1
@@ -103,14 +110,12 @@
     maxVol: 250
 
 - type: entity
-  id: LiverHuman
+  id: OrganHumanLiver
   parent: BaseHumanOrgan
-  name: "human liver"
-  description: "Filters impurities out of a bloodstream and provides other important functionality to a human, such as reagent metabolization."
+  name: liver
+  description: "Pairing suggestion: chianti and fava beans."
   components:
   - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Human/organs.rsi
     state: liver
   - type: Mechanism
     size: 1
@@ -123,15 +128,41 @@
       toxinLethality: 0.01
 
 - type: entity
-  id: KidneysHuman
+  id: OrganHumanKidneys
   parent: BaseHumanOrgan
-  name: "human kidneys"
+  name: kidneys
   description: "Filters toxins out of a bloodstream."
   components:
   - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Human/organs.rsi
-    state: kidneys
+    layers:
+      - state: kidney-l
+      - state: kidney-r
+  - type: Mechanism
+    size: 1
+    compatibility: Biological
+
+- type: entity
+  id: OrganHumanTongue
+  parent: BaseHumanOrgan
+  name: tongue
+  description: "A fleshy muscle mostly used for lying."
+  components:
+  - type: Sprite
+    state: tongue
+  - type: Mechanism
+    size: 1
+    compatibility: Biological
+
+- type: entity
+  id: OrganHumanAppendix
+  parent: BaseHumanOrgan
+  name: appendix
+  components:
+  - type: Sprite
+    layers:
+      - state: appendix
+      - state: appendix-inflamed
+        visible: false
   - type: Mechanism
     size: 1
     compatibility: Biological

Resources/Prototypes/Body/Parts/human.yml

@@ -23,11 +23,11 @@
     size: 14
     compatibility: Biological
     mechanisms:
-    - HeartHuman
-    - LungsHuman
-    - StomachHuman
-    - LiverHuman
-    - KidneysHuman
+    - OrganHumanHeart
+    - OrganHumanLungs
+    - OrganHumanStomach
+    - OrganHumanLiver
+    - OrganHumanKidneys
   - type: BiologicalSurgeryData
   - type: Damageable
     # TODO BODY DettachableDamageableComponent?
@@ -54,8 +54,8 @@
     compatibility: Biological
     vital: true
     mechanisms:
-    - BrainHuman
-    - EyesHuman
+    - OrganHumanBrain
+    - OrganHumanEyes
   - type: BiologicalSurgeryData
   - type: Damageable
     damageContainer: biologicalDamageContainer

Resources/Prototypes/Body/Parts/slime.yml

@@ -22,11 +22,11 @@
       size: 14
       compatibility: Biological
       mechanisms:
-        - HeartHuman
-        - LungsHuman
-        - StomachHuman
-        - LiverHuman
-        - KidneysHuman
+        - OrganHumanHeart
+        - OrganHumanLungs
+        - OrganHumanStomach
+        - OrganHumanLiver
+        - OrganHumanKidneys
     - type: BiologicalSurgeryData
     - type: Damageable
       # TODO BODY DettachableDamageableComponent?
@@ -53,8 +53,8 @@
       compatibility: Biological
       vital: true
       mechanisms:
-        - BrainHuman
-        - EyesHuman
+        - OrganHumanBrain
+        - OrganHumanEyes
     - type: BiologicalSurgeryData
     - type: Damageable
       damageContainer: biologicalDamageContainer

Resources/Prototypes/Body/Parts/vox.yml

@@ -23,11 +23,11 @@
       size: 14
       compatibility: Biological
       mechanisms:
-        - HeartHuman
-        - LungsHuman
-        - StomachHuman
-        - LiverHuman
-        - KidneysHuman
+        - OrganHumanHeart
+        - OrganHumanLungs
+        - OrganHumanStomach
+        - OrganHumanLiver
+        - OrganHumanKidneys
     - type: BiologicalSurgeryData
     - type: Damageable
       # TODO BODY DettachableDamageableComponent?
@@ -54,8 +54,8 @@
       compatibility: Biological
       vital: true
       mechanisms:
-        - BrainHuman
-        - EyesHuman
+        - OrganHumanBrain
+        - OrganHumanEyes
     - type: BiologicalSurgeryData
     - type: Damageable
       damageContainer: biologicalDamageContainer