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: 664 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 527 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

View File

@@ -0,0 +1,99 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "bananalamp",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bananalamp_on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "floodlight",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "floodlight_on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "floodlight_burned",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "floodlight_broken",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lamp",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lamp_on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lampgreen",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lampgreen_on",
"directions": 1,
"delays": [
[
1
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

View File

@@ -0,0 +1,234 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "markerbronze",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerbronze-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerburgundy",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerburgundy-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markercerulean",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markercerulean-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerfuchsia",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerfuchsia-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerindigo",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerindigo-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerjade",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerjade-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerlime",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerlime-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerolive",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerolive-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerpurple",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerpurple-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerrandom",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerteal",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerteal-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerviolet",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markerviolet-on",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markeryellow",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "markeryellow-on",
"directions": 1,
"delays": [
[
1
]
]
}
]
}

View File

@@ -0,0 +1,140 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "",
"states":
[
{
"name": "off-inhand-left",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "off-inhand-right",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "on-inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "on-inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "torch",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "torch_empty",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "torch_on",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 380 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB