Add sprites for Vox organs (#40555)

* Blue organs for blue blood

* EYES GO IN THE HEAD

* Accidental upload

* Also accidental upload

* skreeching for the future

* SKREEEEEEEEEE

* THese are not the files you are looking for

* Sprite attribution

diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml
index 3dbb65c928123bd7d3d105569fc98d67682be030..46583004b21b60ca7a50b3a2d2fe7985da45d676 100644 (file)
--- a/Resources/Prototypes/Body/Organs/vox.yml
+++ b/Resources/Prototypes/Body/Organs/vox.yml
@@ -28,6 +28,8 @@
       tags:
       - Trash
     isSpecialDigestibleExclusive: false
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
 
 - type: entity
   parent: OrganHumanLiver
@@ -37,6 +39,8 @@
   components:
   - type: Metabolizer
     metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
 
 - type: entity
   parent: OrganHumanHeart
@@ -46,3 +50,49 @@
   components:
   - type: Metabolizer
     metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+
+- type: entity
+  parent: OrganHumanKidneys
+  id: OrganVoxKidneys
+  name: kidney
+  description: "Smells flammable."
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+
+- type: entity
+  id: OrganVoxEyes
+  parent: OrganHumanEyes
+  name: eyes
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
+
+- type: entity
+  id: OrganVoxTongueA
+  parent: OrganHumanTongue
+  name: tongue
+  description: "A fleshy muscle mostly used for screaming."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small
+
+- type: entity
+  id: OrganVoxTongueB
+  parent: OrganHumanTongue
+  name: tongue
+  description: "A fleshy muscle mostly used for screaming."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small

diff --git a/Resources/Prototypes/Body/Prototypes/vox.yml b/Resources/Prototypes/Body/Prototypes/vox.yml
index 75824521bd21ceea6dfc1a8811501e791bb0b278..0062149b96d6f78c5b84565b336aab5630e3d617 100644 (file)
--- a/Resources/Prototypes/Body/Prototypes/vox.yml
+++ b/Resources/Prototypes/Body/Prototypes/vox.yml
@@ -9,7 +9,7 @@
       - torso
       organs:
         brain: OrganHumanBrain
-        eyes: OrganHumanEyes
+        eyes: OrganVoxEyes
     torso:
       part: TorsoVox
       connections:
@@ -22,7 +22,7 @@
         lungs: OrganVoxLungs
         stomach: OrganVoxStomach
         liver: OrganVoxLiver
-        kidneys: OrganHumanKidneys
+        kidneys: OrganVoxKidneys
     right arm:
       part: RightArmVox
       connections:

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-l.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-l.png
new file mode 100644 (file)
index 0000000..f1fe5b9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-l.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-r.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-r.png
new file mode 100644 (file)
index 0000000..354b338
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-r.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-left.png
new file mode 100644 (file)
index 0000000..16034e9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-left.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-right.png
new file mode 100644 (file)
index 0000000..b5d8e09
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-right.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-left.png
new file mode 100644 (file)
index 0000000..c6aa210
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-left.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-right.png
new file mode 100644 (file)
index 0000000..5a9ae7c
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-right.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-on.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-on.png
new file mode 100644 (file)
index 0000000..8fdca06
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-on.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-l.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-l.png
new file mode 100644 (file)
index 0000000..74433aa
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-l.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-r.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-r.png
new file mode 100644 (file)
index 0000000..a7d32c6
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-r.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-left.png
new file mode 100644 (file)
index 0000000..b567cab
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-left.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-right.png
new file mode 100644 (file)
index 0000000..7fde799
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-right.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-left.png
new file mode 100644 (file)
index 0000000..031389e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-left.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-right.png
new file mode 100644 (file)
index 0000000..7aa645a
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-right.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver.png
new file mode 100644 (file)
index 0000000..8f525e6
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png
index 5ae28e9594565f346a2e79c80d4e0a135f00e7a1..f34b9a2f3bde44fb2703acde6b852f87c65a177f 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png 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
index 8110a03b4737fafdc276da83aeb9f4b977170d06..da3cf4a8e98f39109b8750b6414be3333e2eef5a 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
index 1d7b44d6edb7a11fbd83b18a85cfd3d4943c2c31..3f5b58707ba233ce64f0bd4ec78ababbd44cf0bf 100644 (file)
--- a/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
@@ -1,12 +1,69 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "made by mubururu_ (github)",
+    "copyright": "Originally from Paradise station, updated and edited for SS14 by MissKay1994 (github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
+        {
+            "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-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
@@ -20,6 +77,20 @@
         },
         {
             "name": "lung-r"
+        },
+        {
+            "name": "stomach"
+        },
+        {
+            "name": "stomach-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "stomach-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "tongue"
         }
     ]
 }

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-left.png
new file mode 100644 (file)
index 0000000..0a3384f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-left.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-right.png
new file mode 100644 (file)
index 0000000..d08f089
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-right.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach.png
new file mode 100644 (file)
index 0000000..d064feb
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach.png differ

diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/tongue.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/tongue.png
new file mode 100644 (file)
index 0000000..eeefc89
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/tongue.png differ