]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
organ sprite touch-ups (#32762)
authormubururu_ <139181059+muburu@users.noreply.github.com>
Mon, 14 Oct 2024 11:32:32 +0000 (06:32 -0500)
committerGitHub <noreply@github.com>
Mon, 14 Oct 2024 11:32:32 +0000 (13:32 +0200)
* 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

46 files changed:
Resources/Prototypes/Body/Organs/Animal/animal.yml
Resources/Prototypes/Body/Organs/arachnid.yml
Resources/Prototypes/Body/Organs/diona.yml
Resources/Prototypes/Body/Organs/human.yml
Resources/Prototypes/Body/Organs/slime.yml
Resources/Prototypes/Body/Organs/vox.yml
Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json
Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json
Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png
Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png
Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-left.png
Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-right.png
Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Slime/organs.rsi/meta.json
Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json [new file with mode: 0644]

index 8384e006df7bb6775d608250d9c0bf08c37dbad3..e59aad9da3fa1372dd6958fb10241a7af1d0f633 100644 (file)
@@ -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
     solutions:
       stomach:
         maxVol: 30
+  - type: Item
+    size: Small
+    heldPrefix: stomach
 
 - type: entity
   id: OrganAnimalLiver
     groups:
     - id: Alcohol
       rateModifier: 0.1
+  - type: Item
+    size: Small
+    heldPrefix: liver
 
 - type: entity
   id: OrganAnimalHeart
     - id: Medicine
     - id: Poison
     - id: Narcotic
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganAnimalKidneys
     maxReagents: 5
     metabolizerTypes: [ Animal ]
     removeEmpty: true
+  - type: Item
+    size: Small
+    heldPrefix: kidneys
index 29ca393d1379c87032683e502e1fb2d9c0a80202..c7542ae11189a5717a7d5a260c9613fba4cccefe 100644 (file)
@@ -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
   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.
       - 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
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
 
 - type: entity
   id: OrganArachnidTongue
index e248355df2c04abf2447e198083138bf4b2f39dc..bf865a07fd9e1b2dc1b6a4e0bb6bf4c635a829e4 100644 (file)
   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
       - 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
index c67f4f6cd16bcd7b9bfb12209fd16cd082080602..cb1492b8a6a1529cfd785e8679430acfb14d5f08 100644 (file)
@@ -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
     layers:
       - state: lung-l
       - state: lung-r
+  - type: Item
+    size: Small
+    heldPrefix: lungs
   - type: Lung
   - type: Metabolizer
     removeEmpty: true
     - id: Medicine
     - id: Poison
     - id: Narcotic
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganHumanStomach
   components:
   - type: Sprite
     state: stomach
+  - type: Item
+    size: Small
+    heldPrefix: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
   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]
     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
index 3da76c5d4aacc4b7e64c9546cdda3fc1fd6ff649..ca22d25423c82c30fd7150b8554a6673ec16fd56 100644 (file)
@@ -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
index 1b4d12116f86f0f07a183181ef2c56158ac367c6..70e078327120217fbc16ea49836bfbafb4d47423 100644 (file)
@@ -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
diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-left.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-left.png
new file mode 100644 (file)
index 0000000..a623e75
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-right.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-right.png
new file mode 100644 (file)
index 0000000..45649b9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/eyeballs-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-left.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-left.png
new file mode 100644 (file)
index 0000000..56698f8
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-right.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-right.png
new file mode 100644 (file)
index 0000000..c7fb399
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-right.png differ
index 6141fd5de86ec6d584604d09d3f3ff241cbb7064..62d1f04bf0cbf08d11e459378c69a936053ac3d2 100644 (file)
@@ -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
       "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",
     {
       "name": "stomach"
     },
+    {
+      "name": "stomach-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "stomach-inhand-right",
+      "directions": 4
+    },
     {
       "name": "web-gland"
     }
diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-left.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-left.png
new file mode 100644 (file)
index 0000000..a346078
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-right.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-right.png
new file mode 100644 (file)
index 0000000..001203b
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-left.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-left.png
new file mode 100644 (file)
index 0000000..43e0cd4
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-right.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-right.png
new file mode 100644 (file)
index 0000000..df6dded
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-left.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-left.png
new file mode 100644 (file)
index 0000000..5d31e96
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-right.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-right.png
new file mode 100644 (file)
index 0000000..4830b1e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs.png
new file mode 100644 (file)
index 0000000..77b61c3
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs.png differ
index 1c1697efc7170502a90d030e83d4ed7e64405a7b..de4f8f8dc39e39e7a567a08003de3d4481bf0f3a 100644 (file)
@@ -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
     {
       "name": "brain"
     },
+    {
+      "name": "brain-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "brain-inhand-right",
+      "directions": 4
+    },
     {
       "name": "ears"
     },
     {
       "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
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-left.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-left.png
new file mode 100644 (file)
index 0000000..e8d5a7c
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-right.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-right.png
new file mode 100644 (file)
index 0000000..257c0af
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-right.png differ
index cf6e4684e9c4c97a7ab764f319a7cd6440eb1919..b4d4d86dd562790d26fab9178584d68f56e0a63c 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png and b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png differ
index 978d4f3c5f14d32809324e1bc11ed5272a85d9a3..2360c07898b86a5cd7e69962665ac63af3e86912 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png and b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-left.png
new file mode 100644 (file)
index 0000000..d018757
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-right.png
new file mode 100644 (file)
index 0000000..4dfafd1
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-left.png
new file mode 100644 (file)
index 0000000..1d73eda
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-right.png
new file mode 100644 (file)
index 0000000..3f7ace9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/heart-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-left.png
new file mode 100644 (file)
index 0000000..f8d889b
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-right.png
new file mode 100644 (file)
index 0000000..9b2e313
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-left.png
new file mode 100644 (file)
index 0000000..d63f9e1
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-right.png
new file mode 100644 (file)
index 0000000..69ce8ff
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/liver-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-left.png
new file mode 100644 (file)
index 0000000..62b30a5
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-right.png
new file mode 100644 (file)
index 0000000..1a5e3a7
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-right.png differ
index 354132ea1104efaf8c252b4854ee39c4ec43fd94..a9112535f82acbb424e26c5426f008910e54dd05 100644 (file)
 {
   "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"
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-left.png
new file mode 100644 (file)
index 0000000..a346078
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-right.png
new file mode 100644 (file)
index 0000000..001203b
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-right.png differ
index a536818eee96f7113aee27ab26ae8fe27c4670ce..c0c260afced206acf2ce79c0dd41f0543a693176 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-left.png and b/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-left.png differ
index c7e0adca9a15c579e2379a6dc8b92575977fd95c..50f22d7a3f26f249b84057206ec3b43bfea8cb06 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-right.png and b/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-left.png b/Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-left.png
new file mode 100644 (file)
index 0000000..0354025
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-right.png b/Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-right.png
new file mode 100644 (file)
index 0000000..a3c6ba4
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-right.png differ
index cacfcdc40bbea854a54a3042f883b33078f3a027..451ab138dfa9f20ccdd03984bfaec808da81adfb 100644 (file)
@@ -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
       "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"
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png
new file mode 100644 (file)
index 0000000..5ae28e9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png
new file mode 100644 (file)
index 0000000..8110a03
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-left.png
new file mode 100644 (file)
index 0000000..4b9489e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-right.png
new file mode 100644 (file)
index 0000000..b1fd546
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lungs-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
new file mode 100644 (file)
index 0000000..1d7b44d
--- /dev/null
@@ -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"
+        }
+    ]
+}