Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

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
}
]
}