Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Makes organs consumable (#3754)

Browse Source 
* Slightly reorganizes Body yaml

* Slightly reorganizes Body yaml

* You can now monch all organs

* Rewrites Mobs/Species/.rsi meta.jsons and replaces some human organ sprites

* ReIDs organs and does some more cleanup
This commit is contained in:
Swept
2021-04-02 13:44:02 +00:00
committed by GitHub
parent 0a04d56865
commit 685f7008a6
29 changed files with 365 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml → Resources/Prototypes/Body/Mechanisms/human.yml
View File

@@ -1,30 +1,29 @@
- type: entity
id: BaseMechanism
parent: BaseItem
name: "base mechanism"
abstract: true
components:
- type: Mechanism
- type: entity
id: BaseHumanOrgan
parent: BaseMechanism
name: "base human organ"
parent: BaseItem
abstract: true
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
- type: entity
id: BrainHuman
parent: BaseHumanOrgan
name: "human brain"
description: "The source of incredible, unending intelligence. Honk."
components:
- type: Tag
tags:
- Grindable
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
- type: Mechanism
- type: Food
- type: SolutionContainer
contents:
reagents:
- ReagentId: chem.Nutriment
Quantity: 10
- type: entity
id: OrganHumanBrain
parent: BaseHumanOrgan
name: brain
description: "The source of incredible, unending intelligence. Honk."
components:
- type: Sprite
state: brain
- type: Mechanism
size: 1
@@ -37,28 +36,26 @@
- type: GhostOnMove
- type: entity
id: EyesHuman
id: OrganHumanEyes
parent: BaseHumanOrgan
name: "human eyes"
description: "Ocular organ capable of turning light into a colorful visual."
name: eyes
description: "I see you!"
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
state: eyeballs
layers:
- state: eyeball-l
- state: eyeball-r
- type: Mechanism
size: 1
compatibility: Biological
- type: entity
id: HeartHuman
id: OrganHumanHeart
parent: BaseHumanOrgan
name: "human heart"
description: "Pumps blood throughout a body. Essential for any entity with blood."
name: heart
description: "I feel bad for the heartless bastard who lost this."
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
state: heart-on
- type: Mechanism
size: 1
@@ -67,15 +64,27 @@
- !type:HeartBehavior {}
- type: entity
id: LungsHuman
id: OrganHumanEars
parent: BaseHumanOrgan
name: "human lungs"
name: ears
description: "There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible."
components:
- type: Sprite
state: ears
- type: Mechanism
size: 1
compatibility: Biological
- type: entity
id: OrganHumanLungs
parent: BaseHumanOrgan
name: lungs
description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
state: lungs
layers:
- state: lung-l
- state: lung-r
- type: Mechanism
size: 1
compatibility: Biological
@@ -83,14 +92,12 @@
- !type:LungBehavior {}
- type: entity
id: StomachHuman
id: OrganHumanStomach
parent: BaseHumanOrgan
name: "human stomach"
name: stomach
description: "Gross. This is hard to stomach."
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
state: stomach
- type: Mechanism
size: 1
@@ -103,14 +110,12 @@
maxVol: 250
- type: entity
id: LiverHuman
id: OrganHumanLiver
parent: BaseHumanOrgan
name: "human liver"
description: "Filters impurities out of a bloodstream and provides other important functionality to a human, such as reagent metabolization."
name: liver
description: "Pairing suggestion: chianti and fava beans."
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
state: liver
- type: Mechanism
size: 1
@@ -123,15 +128,41 @@
toxinLethality: 0.01
- type: entity
id: KidneysHuman
id: OrganHumanKidneys
parent: BaseHumanOrgan
name: "human kidneys"
name: kidneys
description: "Filters toxins out of a bloodstream."
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Human/organs.rsi
state: kidneys
layers:
- state: kidney-l
- state: kidney-r
- type: Mechanism
size: 1
compatibility: Biological
- type: entity
id: OrganHumanTongue
parent: BaseHumanOrgan
name: tongue
description: "A fleshy muscle mostly used for lying."
components:
- type: Sprite
state: tongue
- type: Mechanism
size: 1
compatibility: Biological
- type: entity
id: OrganHumanAppendix
parent: BaseHumanOrgan
name: appendix
components:
- type: Sprite
layers:
- state: appendix
- state: appendix-inflamed
visible: false
- type: Mechanism
size: 1
compatibility: Biological

0
Resources/Prototypes/Body/Mechanisms/basic_tests.yml → Resources/Prototypes/Body/Mechanisms/tests.yml
View File

0
Resources/Prototypes/Body/Mechanisms/vox_organs.yml → Resources/Prototypes/Body/Mechanisms/vox.yml
View File

14
Resources/Prototypes/Body/Parts/human_parts.yml → Resources/Prototypes/Body/Parts/human.yml
View File

@@ -23,11 +23,11 @@
size: 14
compatibility: Biological
mechanisms:
- HeartHuman
- LungsHuman
- StomachHuman
- LiverHuman
- KidneysHuman
- OrganHumanHeart
- OrganHumanLungs
- OrganHumanStomach
- OrganHumanLiver
- OrganHumanKidneys
- type: BiologicalSurgeryData
- type: Damageable
# TODO BODY DettachableDamageableComponent?
@@ -54,8 +54,8 @@
compatibility: Biological
vital: true
mechanisms:
- BrainHuman
- EyesHuman
- OrganHumanBrain
- OrganHumanEyes
- type: BiologicalSurgeryData
- type: Damageable
damageContainer: biologicalDamageContainer

14
Resources/Prototypes/Body/Parts/slime_parts.yml → Resources/Prototypes/Body/Parts/slime.yml
View File

@@ -22,11 +22,11 @@
size: 14
compatibility: Biological
mechanisms:
- HeartHuman
- LungsHuman
- StomachHuman
- LiverHuman
- KidneysHuman
- OrganHumanHeart
- OrganHumanLungs
- OrganHumanStomach
- OrganHumanLiver
- OrganHumanKidneys
- type: BiologicalSurgeryData
- type: Damageable
# TODO BODY DettachableDamageableComponent?
@@ -53,8 +53,8 @@
compatibility: Biological
vital: true
mechanisms:
- BrainHuman
- EyesHuman
- OrganHumanBrain
- OrganHumanEyes
- type: BiologicalSurgeryData
- type: Damageable
damageContainer: biologicalDamageContainer

14
Resources/Prototypes/Body/Parts/vox_parts.yml → Resources/Prototypes/Body/Parts/vox.yml
View File

@@ -23,11 +23,11 @@
size: 14
compatibility: Biological
mechanisms:
- HeartHuman
- LungsHuman
- StomachHuman
- LiverHuman
- KidneysHuman
- OrganHumanHeart
- OrganHumanLungs
- OrganHumanStomach
- OrganHumanLiver
- OrganHumanKidneys
- type: BiologicalSurgeryData
- type: Damageable
# TODO BODY DettachableDamageableComponent?
@@ -54,8 +54,8 @@
compatibility: Biological
vital: true
mechanisms:
- BrainHuman
- EyesHuman
- OrganHumanBrain
- OrganHumanEyes
- type: BiologicalSurgeryData
- type: Damageable
damageContainer: biologicalDamageContainer

0
Resources/Prototypes/Body/Presets/basic_human.yml → Resources/Prototypes/Body/Presets/human.yml
View File

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/appendix-inflamed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/appendix.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 158 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/appendixinflamed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 282 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-l.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-r.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 354 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 574 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-l.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-r.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 351 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/lung-l.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 279 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/lung-r.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 275 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/lungs.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 359 B

133
Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
View File

@@ -1,65 +1,72 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
"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",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "appendix"
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/7489d8e74693f9ca811e4f8a921de10ed96c619e/icons/obj/surgery.dmi",
"states": [
{
"name": "appendix",
},
{
"name": "appendixinflamed",
},
{
"name": "brain",
},
{
"name": "ears",
},
{
"name": "eyeballs",
},
{
"name": "heart-off",
},
{
"name": "heart-on",
"delays": [
[
0.6,
0.1,
0.1
]
]
},
{
"name": "kidneys",
},
{
"name": "liver",
},
{
"name": "lungs",
},
{
"name": "stomach",
},
{
"name": "tonguenormal",
}
]
}
{
"name": "appendix-inflamed"
},
{
"name": "brain"
},
{
"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"
}
]
}

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/muscle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 219 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/nerve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 370 B

After

Width:  |  Height:  |  Size: 191 B

0
Resources/Textures/Mobs/Species/Human/organs.rsi/tonguenormal.png → Resources/Textures/Mobs/Species/Human/organs.rsi/tongue.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 375 B

BIN
Resources/Textures/Mobs/Species/Human/organs.rsi/vessel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 B

287
Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json
View File

@@ -1,231 +1,62 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
"states": [
{
"name": "full",
},
{
"name": "head_f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "head_m",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_arm",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_foot",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_hand",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_leg",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_arm",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_foot",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_hand",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_leg",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "torso_f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "torso_m",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
}
]
{
"name": "head_f",
"directions": 4
},
{
"name": "head_m",
"directions": 4
},
{
"name": "l_arm",
"directions": 4
},
{
"name": "l_foot",
"directions": 4
},
{
"name": "l_hand",
"directions": 4
},
{
"name": "l_leg",
"directions": 4
},
{
"name": "r_arm",
"directions": 4
},
{
"name": "r_foot",
"directions": 4
},
{
"name": "r_hand",
"directions": 4
},
{
"name": "r_leg",
"directions": 4
},
{
"name": "torso_f",
"directions": 4
},
{
"name": "torso_m",
"directions": 4
}
]
}

287
Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json
View File

@@ -1,231 +1,62 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica",
"states": [
{
"name": "full",
},
{
"name": "head_f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "head_m",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_arm",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_foot",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_hand",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_leg",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_arm",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_foot",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_hand",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_leg",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "torso_f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "torso_m",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
}
]
{
"name": "head_f",
"directions": 4
},
{
"name": "head_m",
"directions": 4
},
{
"name": "l_arm",
"directions": 4
},
{
"name": "l_foot",
"directions": 4
},
{
"name": "l_hand",
"directions": 4
},
{
"name": "l_leg",
"directions": 4
},
{
"name": "r_arm",
"directions": 4
},
{
"name": "r_foot",
"directions": 4
},
{
"name": "r_hand",
"directions": 4
},
{
"name": "r_leg",
"directions": 4
},
{
"name": "torso_f",
"directions": 4
},
{
"name": "torso_m",
"directions": 4
}
]
}

76
Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json
View File

@@ -1 +1,75 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb", "states": [{"name": "groin_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "groin_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "head_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "head_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_foot", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "overlay_husk", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_foot", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "torso_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "torso_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "vox_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "groin_f",
"directions": 4
},
{
"name": "groin_m",
"directions": 4
},
{
"name": "head_f",
"directions": 4
},
{
"name": "head_m",
"directions": 4
},
{
"name": "l_arm",
"directions": 4
},
{
"name": "l_foot",
"directions": 4
},
{
"name": "l_hand",
"directions": 4
},
{
"name": "l_leg",
"directions": 4
},
{
"name": "overlay_husk",
"directions": 4
},
{
"name": "r_arm",
"directions": 4
},
{
"name": "r_foot",
"directions": 4
},
{
"name": "r_hand",
"directions": 4
},
{
"name": "r_leg",
"directions": 4
},
{
"name": "torso_f",
"directions": 4
},
{
"name": "torso_m",
"directions": 4
},
{
"name": "vox_m",
"directions": 4
}
]
}

0
Resources/Textures/Mobs/Parts/lungs_phoronman.png → Resources/Textures/Mobs/Species/lungs_phoronman.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B