From: mubururu_ <139181059+muburu@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:32:32 +0000 (-0500) Subject: organ sprite touch-ups (#32762) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6654e0041199874ca6fc8644ef3f36e93efc2e2d;p=space-station-14.git 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 --- diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml index 8384e006df..e59aad9da3 100644 --- a/Resources/Prototypes/Body/Organs/Animal/animal.yml +++ b/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 diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 29ca393d13..c7542ae111 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/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 diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index e248355df2..bf865a07fd 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/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 diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index c67f4f6cd1..cb1492b8a6 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/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 diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml index 3da76c5d4a..ca22d25423 100644 --- a/Resources/Prototypes/Body/Organs/slime.yml +++ b/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 diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml index 1b4d12116f..70e0783271 100644 --- a/Resources/Prototypes/Body/Organs/vox.yml +++ b/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 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 index 0000000000..a623e75a28 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 index 0000000000..45649b9261 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 index 0000000000..56698f87e2 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 index 0000000000..c7fb399399 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-inhand-right.png differ diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json index 6141fd5de8..62d1f04bf0 100644 --- a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json +++ b/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" } 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 index 0000000000..a346078b4a 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 index 0000000000..001203bdc3 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 index 0000000000..43e0cd4034 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 index 0000000000..df6dded744 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 index 0000000000..5d31e96a37 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 index 0000000000..4830b1e0a6 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 index 0000000000..77b61c344f Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/lungs.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json index 1c1697efc7..de4f8f8dc3 100644 --- a/Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json +++ b/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 } ] } 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 index 0000000000..e8d5a7c86c 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 index 0000000000..257c0af83a Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach-inhand-right.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png index cf6e4684e9..b4d4d86dd5 100644 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 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png index 978d4f3c5f..2360c07898 100644 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 index 0000000000..d0187579a3 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 index 0000000000..4dfafd118d 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 index 0000000000..1d73edaf03 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 index 0000000000..3f7ace9b48 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 index 0000000000..f8d889b5de 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 index 0000000000..9b2e313150 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 index 0000000000..d63f9e1ef4 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 index 0000000000..69ce8ffd77 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 index 0000000000..62b30a5ad5 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 index 0000000000..1a5e3a7058 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs-inhand-right.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json index 354132ea11..a9112535f8 100644 --- a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json +++ b/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" + } + ] } 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 index 0000000000..a346078b4a 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 index 0000000000..001203bdc3 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach-inhand-right.png differ diff --git a/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-left.png b/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-left.png index a536818eee..c0c260afce 100644 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 diff --git a/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-right.png b/Resources/Textures/Mobs/Species/Slime/organs.rsi/brain-inhand-right.png index c7e0adca9a..50f22d7a3f 100644 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 index 0000000000..0354025ce9 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 index 0000000000..a3c6ba485e Binary files /dev/null and b/Resources/Textures/Mobs/Species/Slime/organs.rsi/lungs-inhand-right.png differ diff --git a/Resources/Textures/Mobs/Species/Slime/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Slime/organs.rsi/meta.json index cacfcdc40b..451ab138df 100644 --- a/Resources/Textures/Mobs/Species/Slime/organs.rsi/meta.json +++ b/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" 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 index 0000000000..5ae28e9594 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 index 0000000000..8110a03b47 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 index 0000000000..4b9489e838 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 index 0000000000..b1fd54694e 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 index 0000000000..1d7b44d6ed --- /dev/null +++ b/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" + } + ] +}