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
BIN
Resources/Textures/Objects/Misc/lights.rsi/bananalamp.png
Normal file
|
After Width: | Height: | Size: 664 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/bananalamp_on.png
Normal file
|
After Width: | Height: | Size: 154 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/floodlight.png
Normal file
|
After Width: | Height: | Size: 357 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/floodlight_broken.png
Normal file
|
After Width: | Height: | Size: 381 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/floodlight_burned.png
Normal file
|
After Width: | Height: | Size: 527 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/floodlight_on.png
Normal file
|
After Width: | Height: | Size: 124 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/lamp.png
Normal file
|
After Width: | Height: | Size: 514 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/lamp_on.png
Normal file
|
After Width: | Height: | Size: 181 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/lampgreen.png
Normal file
|
After Width: | Height: | Size: 470 B |
BIN
Resources/Textures/Objects/Misc/lights.rsi/lampgreen_on.png
Normal file
|
After Width: | Height: | Size: 183 B |
99
Resources/Textures/Objects/Misc/lights.rsi/meta.json
Normal 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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerbronze.png
Normal file
|
After Width: | Height: | Size: 207 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerbronze_on.png
Normal file
|
After Width: | Height: | Size: 283 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerburgundy.png
Normal file
|
After Width: | Height: | Size: 184 B |
|
After Width: | Height: | Size: 273 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markercerulean.png
Normal file
|
After Width: | Height: | Size: 204 B |
|
After Width: | Height: | Size: 284 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia.png
Normal file
|
After Width: | Height: | Size: 204 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia_on.png
Normal file
|
After Width: | Height: | Size: 283 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerindigo.png
Normal file
|
After Width: | Height: | Size: 183 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerindigo_on.png
Normal file
|
After Width: | Height: | Size: 280 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerjade.png
Normal file
|
After Width: | Height: | Size: 204 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerjade_on.png
Normal file
|
After Width: | Height: | Size: 286 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerlime.png
Normal file
|
After Width: | Height: | Size: 207 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerlime_on.png
Normal file
|
After Width: | Height: | Size: 287 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerolive.png
Normal file
|
After Width: | Height: | Size: 187 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerolive_on.png
Normal file
|
After Width: | Height: | Size: 277 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerpurple.png
Normal file
|
After Width: | Height: | Size: 205 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerpurple_on.png
Normal file
|
After Width: | Height: | Size: 284 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerrandom.png
Normal file
|
After Width: | Height: | Size: 196 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerteal.png
Normal file
|
After Width: | Height: | Size: 189 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerteal_on.png
Normal file
|
After Width: | Height: | Size: 275 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerviolet.png
Normal file
|
After Width: | Height: | Size: 189 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markerviolet_on.png
Normal file
|
After Width: | Height: | Size: 274 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markeryellow.png
Normal file
|
After Width: | Height: | Size: 187 B |
BIN
Resources/Textures/Objects/Misc/markers.rsi/markeryellow_on.png
Normal file
|
After Width: | Height: | Size: 274 B |
234
Resources/Textures/Objects/Misc/markers.rsi/meta.json
Normal 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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
140
Resources/Textures/Objects/Misc/torch.rsi/meta.json
Normal 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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
BIN
Resources/Textures/Objects/Misc/torch.rsi/off-inhand-left.png
Normal file
|
After Width: | Height: | Size: 376 B |
BIN
Resources/Textures/Objects/Misc/torch.rsi/off-inhand-right.png
Normal file
|
After Width: | Height: | Size: 380 B |
BIN
Resources/Textures/Objects/Misc/torch.rsi/on-inhand-left.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
Resources/Textures/Objects/Misc/torch.rsi/on-inhand-right.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
Resources/Textures/Objects/Misc/torch.rsi/torch.png
Normal file
|
After Width: | Height: | Size: 296 B |
BIN
Resources/Textures/Objects/Misc/torch.rsi/torch_empty.png
Normal file
|
After Width: | Height: | Size: 199 B |
BIN
Resources/Textures/Objects/Misc/torch.rsi/torch_on.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |