TABLE TIME LET'S GET ITTTTTTT (#2141)

* Replace pilot chair with a better sprite

* Refactors furniture.yml

* Cleans up dumb indentations

* Massive table cleanup YEAAHAHAAAHAHAHA FUCK YEAH WE CAN GAMBLE NOW

* Bookshelves, rack, metal shelf

* Actually good looking carpets holy crap lois

* three more colored carpets

* Rest of carpet colors and they now have proper drawdepth

* Adds Phoron windows and recolor phoron gas

* A bunch of decorative lights

* CarpetBase now abstract

* Inhands for torches

* Tables now have icons and a much nicer rsi/yaml layout

* Carpet Icons fix

* Removes old carpet
This commit is contained in:
Swept
2020-09-29 14:11:42 +00:00
committed by GitHub
parent 1b691264f3
commit 552918d59d
273 changed files with 3373 additions and 202 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 640 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 640 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 481 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 481 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 435 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 397 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 647 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 647 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 464 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 464 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 419 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "carpet_0",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_1",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_2",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_3",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_4",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_5",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_6",
"select": [],
"flags": {},
"directions": 4
},
{
"name": "carpet_7",
"select": [],
"flags": {},
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32,
"license":"CC-BY-SA-3.0",
"copyright":"Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f777c8ddf7a529b002df17909566d5d93b8ad201",
},
"states": [
{
"name": "book-0",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "book-1",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "book-2",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "book-3",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "book-4",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "book-5",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 B

View File

@@ -77,15 +77,6 @@
]
]
},
{
"name": "blank",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "chair",
"directions": 4,

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B

View File

@@ -0,0 +1,164 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"states": [
{
"name": "full",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "state_0",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "state_1",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "state_2",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "state_3",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "state_4",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "state_5",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "state_6",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "state_7",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 500 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 507 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 506 B

Some files were not shown because too many files have changed in this diff Show More