organ sprite touch-ups (#32762)

* does work?

* fix

* shrunk organs to normal size of small

* made brains and liver look better

* made stomach slightly less bright

* unique sprite for diona lungs + inhands

* unique sprite for vox lungs + inhands

Resources/Prototypes/Body/Organs/Animal/animal.yml

@@ -60,6 +60,9 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
+  - type: Item
+    size: Small
+    heldPrefix: lungs
 
 - type: entity
   id: OrganAnimalStomach
@@ -86,6 +89,9 @@
     groups:
     - id: Food
     - id: Drink
+  - type: Item
+    size: Small
+    heldPrefix: stomach
 
 - type: entity
   id: OrganMouseStomach
@@ -97,6 +103,9 @@
     solutions:
       stomach:
         maxVol: 30
+  - type: Item
+    size: Small
+    heldPrefix: stomach
 
 - type: entity
   id: OrganAnimalLiver
@@ -113,6 +122,9 @@
     groups:
     - id: Alcohol
       rateModifier: 0.1
+  - type: Item
+    size: Small
+    heldPrefix: liver
 
 - type: entity
   id: OrganAnimalHeart
@@ -130,6 +142,9 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganAnimalKidneys
@@ -146,3 +161,6 @@
     maxReagents: 5
     metabolizerTypes: [ Animal ]
     removeEmpty: true
+  - type: Item
+    size: Small
+    heldPrefix: kidneys

Resources/Prototypes/Body/Organs/arachnid.yml

@@ -34,6 +34,9 @@
   - type: Sprite
     sprite: Mobs/Species/Arachnid/organs.rsi
     state: stomach
+  - type: Item
+    size: Small
+    heldPrefix: stomach
   - type: Stomach
     updateInterval: 1.5
   - type: SolutionContainerManager
@@ -91,6 +94,9 @@
   components:
   - type: Sprite
     state: heart-on
+  - type: Item
+    size: Small
+    heldPrefix: heart
   - type: Metabolizer
     updateInterval: 1.5
     maxReagents: 2
@@ -107,6 +113,9 @@
   description: "Pairing suggestion: chianti and fava beans."
   categories: [ HideSpawnMenu ]
   components:
+  - type: Item
+    size: Small
+    heldPrefix: liver
   - type: Sprite
     state: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
@@ -129,6 +138,9 @@
       - state: kidney-l
       - state: kidney-r
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
+  - type: Item
+    size: Small
+    heldPrefix: kidneys
   - type: Metabolizer
     updateInterval: 1.5
     maxReagents: 5
@@ -145,6 +157,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
 
 - type: entity
   id: OrganArachnidTongue

Resources/Prototypes/Body/Organs/diona.yml

@@ -29,8 +29,11 @@
   id: OrganDionaBrain
   parent: [BaseDionaOrgan, OrganHumanBrain]
   name: brain
-  description: "The source of incredible, unending intelligence. Honk."
+  description: "The central hub of a diona's pseudo-neurological activity, its root-like tendrils search for its former body."
   components:
+  - type: Item
+    size: Small
+    heldPrefix: brain
   - type: Sprite
     state: brain
   - type: SolutionContainerManager
@@ -64,7 +67,7 @@
   id: OrganDionaStomach
   parent: BaseDionaOrgan
   name: stomach
-  description: "Gross. This is hard to stomach."
+  description: "The diona's equivalent of a stomach, it reeks of asparagus and vinegar."
   components:
   - type: Sprite
     state: stomach
@@ -90,18 +93,21 @@
       - id: Narcotic
       - id: Alcohol
         rateModifier: 0.1
+  - type: Item
+    size: Small
+    heldPrefix: stomach
 
 - type: entity
   id: OrganDionaLungs
   parent: BaseDionaOrgan
   name: lungs
-  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
+  description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
   components:
   - type: Sprite
-    sprite: Mobs/Species/Human/organs.rsi
-    layers:
-      - state: lung-l
-      - state: lung-r
+    state: lungs
+  - type: Item
+    size: Small
+    heldPrefix: lungs
   - type: Lung 
   - type: Metabolizer
     removeEmpty: true

Resources/Prototypes/Body/Organs/human.yml

@@ -71,6 +71,9 @@
     entries:
       Burger: Brain
       Taco: Brain
+  - type: Item
+    size: Small
+    heldPrefix: brain
   
 - type: entity
   id: OrganHumanEyes
@@ -82,6 +85,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
 
 - type: entity
   id: OrganHumanTongue
@@ -122,6 +128,9 @@
     layers:
       - state: lung-l
       - state: lung-r
+  - type: Item
+    size: Small
+    heldPrefix: lungs
   - type: Lung
   - type: Metabolizer
     removeEmpty: true
@@ -164,6 +173,9 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganHumanStomach
@@ -173,6 +185,9 @@
   components:
   - type: Sprite
     state: stomach
+  - type: Item
+    size: Small
+    heldPrefix: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -202,6 +217,9 @@
   components:
   - type: Sprite
     state: liver
+  - type: Item
+    size: Small
+    heldPrefix: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
     maxReagents: 1
     metabolizerTypes: [Human]
@@ -219,6 +237,9 @@
     layers:
       - state: kidney-l
       - state: kidney-r
+  - type: Item
+    size: Small
+    heldPrefix: kidneys
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
   - type: Metabolizer
     maxReagents: 5

Resources/Prototypes/Body/Organs/slime.yml

@@ -33,6 +33,9 @@
           reagents:
           - ReagentId: Slime
             Quantity: 10
+    - type: Item
+      size: Small
+      heldPrefix: brain
 
       
 - type: entity
@@ -70,3 +73,6 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
+  - type: Item
+    size: Small
+    heldPrefix: lungs

Resources/Prototypes/Body/Organs/vox.yml

@@ -1,9 +1,15 @@
 - type: entity
   id: OrganVoxLungs
   parent: OrganHumanLungs
+  description: "The blue, anaerobic lungs of a vox, they intake nitrogen to breathe. Any form of gaseous oxygen is lethally toxic if breathed in."
   suffix: "vox"
   components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
   - type: Metabolizer
     metabolizerTypes: [ Vox ]
   - type: Lung
     alert: LowNitrogen
+  - type: Item
+    size: Small
+    heldPrefix: lungs

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
+  "copyright": "Made by PixelTheKermit (github) for SS14, inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -14,7 +14,23 @@
       "name": "eyeball-r"
     },
     {
-      "name": "tongue"
+      "name": "eyeballs-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "eyeballs-inhand-right",
+      "directions": 4
+    },
+    {
+        "name": "tongue"
+    },
+    {
+      "name": "heart-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "heart-inhand-right",
+      "directions": 4
     },
     {
       "name": "heart-on",
@@ -42,6 +58,14 @@
     {
       "name": "stomach"
     },
+    {
+      "name": "stomach-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "stomach-inhand-right",
+      "directions": 4
+    },
     {
       "name": "web-gland"
     }

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe",
+  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe lungs and inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "brain"
     },
+    {
+      "name": "brain-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "brain-inhand-right",
+      "directions": 4
+    },
     {
       "name": "ears"
     },
@@ -19,8 +27,27 @@
     {
       "name": "eyeball-r"
     },
+    {
+      "name": "lungs"
+    },
+    {
+      "name": "lungs-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "lungs-inhand-right",
+      "directions": 4
+    },
     {
       "name": "stomach"
+    },
+    {
+      "name": "stomach-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "stomach-inhand-right",
+      "directions": 4
     }
   ]
 }

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

@@ -1,80 +1,128 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af",
+  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af, inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "appendix"
-    },
-    {
-      "name": "appendix-inflamed"
-    },
-    {
-      "name": "brain"
-    },
-    {
-      "name": "brain-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "brain-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "ears"
-    },
-    {
-      "name": "eyeball-l"
-    },
-    {
-      "name": "eyeball-r"
-    },
-    {
-      "name": "heart-off"
-    },
-    {
-      "name": "heart-on",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "kidney-l"
-    },
-    {
-      "name": "kidney-r"
-    },
-    {
-      "name": "liver"
-    },
-    {
-      "name": "lung-l"
-    },
-    {
-      "name": "lung-r"
-    },
-    {
-      "name": "stomach"
-    },
-    {
-      "name": "tongue"
-    },
-    {
-      "name": "muscle"
-    },
-    {
-      "name": "nerve"
-    },
-    {
-      "name": "vessel"
-    }
-  ]
+    "states": [
+        {
+            "name": "appendix"
+        },
+        {
+            "name": "appendix-inflamed"
+        },
+        {
+            "name": "brain"
+        },
+        {
+            "name": "brain-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "brain-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ears"
+        },
+        {
+            "name": "eyeballs-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "eyeballs-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "eyeball-l"
+        },
+        {
+            "name": "eyeball-r"
+        },
+        {
+            "name": "heart-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "heart-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "heart-off"
+        },
+        {
+            "name": "heart-on",
+            "delays": [
+                [
+                    0.6,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "kidneys-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "kidneys-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "kidney-l"
+        },
+        {
+            "name": "kidney-r"
+        },
+        {
+            "name": "liver"
+        },
+        {
+            "name": "liver-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "liver-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "lungs-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "lungs-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "lung-l"
+        },
+        {
+            "name": "lung-r"
+        },
+        {
+            "name": "stomach"
+        },
+        {
+            "name": "stomach-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "stomach-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "tongue"
+        },
+        {
+            "name": "muscle"
+        },
+        {
+            "name": "nerve"
+        },
+        {
+            "name": "vessel"
+        }
+    ]
 }

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by Nimfar11 (Github) for Space Station 14",
+  "copyright": "Sprited by Nimfar11 (Github) for Space Station 14, inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -15,8 +15,16 @@
       "directions": 4
     },
     {
-      "name": "brain-inhand-right",
-      "directions": 4
+        "name": "brain-inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "lungs-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "lungs-inhand-right",
+        "directions": 4
     },
     {
       "name": "lung-l-slime"

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

@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "lungs-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "lungs-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "lung-l"
+        },
+        {
+            "name": "lung-r"
+        }
+    ]
+}