Re-organizing the Resources folder. Part 1. (#1234)

* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
This commit is contained in:
AJCM-git
2020-07-07 13:19:00 -04:00
committed by GitHub
parent 39290cffaa
commit ae41d03ec6
5594 changed files with 6524 additions and 6481 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

View File

@@ -0,0 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "states": [{"name": "broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "burned", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "empty", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "off", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "on", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

View File

@@ -0,0 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "states": [{"name": "broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "burned", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "empty", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "off", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "on", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 368 B

View File

@@ -0,0 +1 @@
{"version":1,"size":{"x":32,"y":32},"states":[{"name":"on","select":[],"flags":{},"directions":4},{"name":"off","select":[],"flags":{},"directions":4},{"name":"construct","select":[],"flags":{},"directions":4},{"name":"empty","select":[],"flags":{},"directions":4}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 842 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 730 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -0,0 +1 @@
{"version":1,"size":{"x":64,"y":32},"states":[{"name":"alohasnackbar","directions":1,"delays":[[1.0]]},{"name":"combocafe","directions":1,"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":"emergencyrumparty","directions":1,"delays":[[1.0,1.0,1.0,5.0,1.0,1.0,1.0,1.0]]},{"name":"empbarsign","directions":1,"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,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,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,0.1,0.1,0.1,0.1]]},{"name":"empty","directions":1,"delays":[[1.0]]},{"name":"goose","directions":1,"delays":[[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]]},{"name":"honkednloaded","directions":1,"delays":[[0.4,1.0]]},{"name":"maidcafe","directions":1,"delays":[[1.0,0.03,0.03,0.03,0.03,0.6,0.03,0.03,2.0,0.03,0.03,0.03,0.03,2.0,0.03,0.03]]},{"name":"maltesefalcon","directions":1,"delays":[[3.8,0.4,1.6,0.1,5.6,0.1,0.4,0.1]]},{"name":"officerbeersky","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"name":"oldcockinn","directions":1,"delays":[[1.8,0.1,0.1,0.6,0.8,0.6,0.8,0.6,2.4,0.1,0.1,0.1]]},{"name":"robustacafe","directions":1,"delays":[[1.8,0.1,0.1,0.1,0.1,1.6,0.1,0.1,0.6,0.6,0.6,0.6,0.6,0.6,0.6,0.6,0.6,0.1,0.1]]},{"name":"scotchservinwill","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"name":"slipperyshots","directions":1,"delays":[[0.4,1.0]]},{"name":"syndibarsign","directions":1,"delays":[[0.1,0.9,2.5,1.0,2.5,0.1,0.05,0.2,0.1,0.05,2.5,1.0,2.5,0.1,0.05,0.2,0.1,0.05,2.5,1.0]]},{"name":"the_lightbulb","directions":1,"delays":[[0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,1.6,0.1,1.3,0.2,2.0,0.3]]},{"name":"theadminbus","directions":1,"delays":[[2.5,1.5]]},{"name":"thealenath","directions":1,"delays":[[1.8,0.1,0.1,0.1,0.1,1.6,0.1,0.1,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.1,0.1]]},{"name":"thebark","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"name":"thecavern","directions":1,"delays":[[1.0,4.5,0.2,1.5]]},{"name":"thecoderbus","directions":1,"delays":[[2.5,1.5]]},{"name":"thedrunkcarp","directions":1,"delays":[[0.5,0.1,0.4,1.0,0.5,0.3,0.1,1.0]]},{"name":"thegreytide","directions":1,"delays":[[0.4,1.0]]},{"name":"theharmbaton","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"name":"thenest","directions":1,"delays":[[0.6,0.6,0.6,0.6,0.6,0.2,0.2,0.6,0.6,0.4,0.1,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.1,0.4,0.1,0.4,0.4]]},{"name":"thenet","directions":1,"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,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,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,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":"theouterspess","directions":1,"delays":[[1.0,1.0]]},{"name":"theshaken","directions":1,"delays":[[1.8,0.1,0.1,0.1,0.1,1.6,0.1,0.1,0.6,0.6,0.6,0.6,0.6,0.6,0.6,0.6,0.6,0.1,0.1]]},{"name":"thesingulo","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"thewretchedhive","directions":1,"delays":[[0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.1,0.1,0.1,0.4]]},{"name":"vladssaladbar","directions":1,"delays":[[1.0]]},{"name":"enginechange","directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]]}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 998 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 723 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 568 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 692 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

View File

@@ -0,0 +1,432 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "armchair_preview",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "bar_chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "bar_chair_over",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "bar_stool",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bed",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "blank",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "chair_armrest",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "chair_padding",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "chair_padding_over",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "chair_preview",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "comfychair_preview",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "officechair_dark",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "officechair_white",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "onestar_chair_grey",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "onestar_chair_red",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "psychbed",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "psychbed_padding",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "shuttle_chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "stool_base",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "stool_padded_preview",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "stool_padding",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "stool_preview",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "w_overlay",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "wheelchair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "wheelchair_folded",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "wooden_chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "wooden_chair_wings",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 906 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 934 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 882 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 852 B

View File

@@ -0,0 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "mirror", "directions": 1, "delays": [[1.0]]}, {"name": "mirror_broke", "directions": 1, "delays": [[1.0]]}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 669 B

View File

@@ -0,0 +1,288 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "random",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "applebush",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-01",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-02",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-03",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-04",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-05",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-06",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-07",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-08",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-09",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-10",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-11",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-12",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-13",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-14",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-15",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-16",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-17",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-18",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-19",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-20",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-21",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-22",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-23",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-24",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-25",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-26",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-27",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-28",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "plant-29",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 742 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 768 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 741 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 825 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 879 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 515 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

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