Skip to content

Commit

Permalink
organ sprite touch-ups (#32762)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
muburu authored Oct 14, 2024
1 parent 8c17624 commit 6654e00
Show file tree
Hide file tree
Showing 46 changed files with 289 additions and 85 deletions.
18 changes: 18 additions & 0 deletions Resources/Prototypes/Body/Organs/Animal/animal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Item
size: Small
heldPrefix: lungs

- type: entity
id: OrganAnimalStomach
Expand All @@ -86,6 +89,9 @@
groups:
- id: Food
- id: Drink
- type: Item
size: Small
heldPrefix: stomach

- type: entity
id: OrganMouseStomach
Expand All @@ -97,6 +103,9 @@
solutions:
stomach:
maxVol: 30
- type: Item
size: Small
heldPrefix: stomach

- type: entity
id: OrganAnimalLiver
Expand All @@ -113,6 +122,9 @@
groups:
- id: Alcohol
rateModifier: 0.1
- type: Item
size: Small
heldPrefix: liver

- type: entity
id: OrganAnimalHeart
Expand All @@ -130,6 +142,9 @@
- id: Medicine
- id: Poison
- id: Narcotic
- type: Item
size: Small
heldPrefix: heart

- type: entity
id: OrganAnimalKidneys
Expand All @@ -146,3 +161,6 @@
maxReagents: 5
metabolizerTypes: [ Animal ]
removeEmpty: true
- type: Item
size: Small
heldPrefix: kidneys
15 changes: 15 additions & 0 deletions Resources/Prototypes/Body/Organs/arachnid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -91,6 +94,9 @@
components:
- type: Sprite
state: heart-on
- type: Item
size: Small
heldPrefix: heart
- type: Metabolizer
updateInterval: 1.5
maxReagents: 2
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -145,6 +157,9 @@
layers:
- state: eyeball-l
- state: eyeball-r
- type: Item
size: Small
heldPrefix: eyeballs

- type: entity
id: OrganArachnidTongue
Expand Down
20 changes: 13 additions & 7 deletions Resources/Prototypes/Body/Organs/diona.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Body/Organs/human.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
entries:
Burger: Brain
Taco: Brain
- type: Item
size: Small
heldPrefix: brain

- type: entity
id: OrganHumanEyes
Expand All @@ -82,6 +85,9 @@
layers:
- state: eyeball-l
- state: eyeball-r
- type: Item
size: Small
heldPrefix: eyeballs

- type: entity
id: OrganHumanTongue
Expand Down Expand Up @@ -122,6 +128,9 @@
layers:
- state: lung-l
- state: lung-r
- type: Item
size: Small
heldPrefix: lungs
- type: Lung
- type: Metabolizer
removeEmpty: true
Expand Down Expand Up @@ -164,6 +173,9 @@
- id: Medicine
- id: Poison
- id: Narcotic
- type: Item
size: Small
heldPrefix: heart

- type: entity
id: OrganHumanStomach
Expand All @@ -173,6 +185,9 @@
components:
- type: Sprite
state: stomach
- type: Item
size: Small
heldPrefix: stomach
- type: SolutionContainerManager
solutions:
stomach:
Expand Down Expand Up @@ -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]
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Body/Organs/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
reagents:
- ReagentId: Slime
Quantity: 10
- type: Item
size: Small
heldPrefix: brain


- type: entity
Expand Down Expand Up @@ -70,3 +73,6 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Item
size: Small
heldPrefix: lungs
6 changes: 6 additions & 0 deletions Resources/Prototypes/Body/Organs/vox.yml
Original file line number Diff line number Diff line change
@@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 26 additions & 2 deletions Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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",
Expand Down Expand Up @@ -42,6 +58,14 @@
{
"name": "stomach"
},
{
"name": "stomach-inhand-left",
"directions": 4
},
{
"name": "stomach-inhand-right",
"directions": 4
},
{
"name": "web-gland"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 28 additions & 1 deletion Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,6 +10,14 @@
{
"name": "brain"
},
{
"name": "brain-inhand-left",
"directions": 4
},
{
"name": "brain-inhand-right",
"directions": 4
},
{
"name": "ears"
},
Expand All @@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6654e00

Please sign in to comment.