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

View File

@@ -1 +0,0 @@
{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"booze_dispenser","directions":1,"delays":[[1.0]]},{"name":"dispenser","directions":1,"delays":[[1.0]]},{"name":"genesplicer_empty","directions":1,"delays":[[1.0]]},{"name":"genesplicer_loaded","directions":1,"delays":[[1.0]]},{"name":"genesplicer_screens","directions":1,"delays":[[0.4,0.4,0.4,0.4]]},{"name":"industrial_dispenser","directions":1,"delays":[[1.0]]},{"name":"mixer_empty","directions":1,"delays":[[1.0]]},{"name":"mixer_loaded","directions":1,"delays":[[1.0]]},{"name":"mixer_screens","directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]]},{"name":"mixer_splicer_screen_broken","directions":1,"delays":[[1.0]]},{"name":"soda_dispenser","directions":1,"delays":[[1.0]]}]}

View File

@@ -1,252 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "lock_locked",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "lock_off",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "lock_unlocked",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "sparking",
"select": [],
"flags": {},
"directions": 1,
"delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
},
{
"name": "crate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "crate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "crate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "freezer",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "freezer_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "freezer_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "hydrocrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "hydrocrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "hydrocrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "hydrosecurecrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "hydrosecurecrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "hydrosecurecrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "medicalcrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "medicalcrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "medicalcrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "o2crate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "o2crate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "o2crate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "plasmacrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "plasmacrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "plasmacrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "plasticcrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "plasticcrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "plasticcrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "radiationcrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "radiationcrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "radiationcrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "secgearcrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "secgearcrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "secgearcrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "securecrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "securecrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "securecrate_open",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "weaponcrate",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "weaponcrate_door",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "weaponcrate_open",
"select": [],
"flags": {},
"directions": 1
}
]
}

View File

@@ -1,123 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/plants.dmi and modified by Swept",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "plant_1",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_2",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_3",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_4",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_5",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_6",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_7",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_8",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_9",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_10",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_11",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_12",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_13",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_14",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
{
"name": "plant_15",
"select": [],
"flags": {},
"directions": 1,
"delays": []
},
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 527 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 435 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 493 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 606 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

View File

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 240 B

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "backpack",
"directions": 1
},
{
"name": "backpack-equipped-BACKPACK",
"directions": 4
},
{
"name": "backpack-inhand-left",
"directions": 4
},
{
"name": "backpack-inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 270 B

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "captain-inhand-right",
"directions": 4
},
{
"name": "captain",
"directions": 1
},
{
"name": "captain-equipped-BACKPACK",
"directions": 4
},
{
"name": "captain-inhand-left",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 320 B

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "clown-inhand-right",
"directions": 4
},
{
"name": "clown",
"directions": 1
},
{
"name": "clown-inhand-left",
"directions": 4
},
{
"name": "clown-equipped-BACKPACK",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 371 B

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "engineering",
"directions": 1
},
{
"name": "engineering-inhand-left",
"directions": 4
},
{
"name": "engineering-equipped-BACKPACK",
"directions": 4
},
{
"name": "engineering-inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 375 B

View File

Before

Width:  |  Height:  |  Size: 470 B

After

Width:  |  Height:  |  Size: 470 B

View File

Before

Width:  |  Height:  |  Size: 584 B

After

Width:  |  Height:  |  Size: 584 B

View File

@@ -0,0 +1,91 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "holding-equipped-BACKPACK",
"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,
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": "holding-inhand-right",
"directions": 4
},
{
"name": "holding-broken",
"directions": 1
},
{
"name": "holding",
"directions": 1,
"delays": [[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]]
},
{
"name": "holding-unlit",
"directions": 1,
"delays": [[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]]
},
{
"name": "holding-broken-equipped-BACKPACK",
"directions": 4
},
{
"name": "holding-inhand-left",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 251 B

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "medical-equipped-BACKPACK",
"directions": 4
},
{
"name": "medical",
"directions": 1
},
{
"name": "medical-inhand-left",
"directions": 4
},
{
"name": "medical-inhand-right",
"directions": 4
}
]
}

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "security-inhand-left",
"directions": 4
},
{
"name": "security-equipped-BACKPACK",
"directions": 4
},
{
"name": "security",
"directions": 1
},
{
"name": "security-inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 270 B

View File

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 271 B

View File

Before

Width:  |  Height:  |  Size: 267 B

After

Width:  |  Height:  |  Size: 267 B

View File

@@ -6,15 +6,15 @@
},
"states": [
{
"name": "spear",
"name": "courier-black",
"directions": 1
},
{
"name": "slash",
"directions": 1
"name": "courier-equipped-BACKPACK",
"directions": 4
},
{
"name": "fist",
"name": "courier",
"directions": 1
}
]

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-captain-equipped-BACKPACK",
"directions": 4
},
{
"name": "courier-captain",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-chemistry",
"directions": 1
},
{
"name": "courier-chemistry-equipped-BACKPACK",
"directions": 4
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-engineering",
"directions": 1
},
{
"name": "courier-engineering-equipped-BACKPACK",
"directions": 4
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-hydroponics",
"directions": 1
},
{
"name": "courier-hydroponics-equipped-BACKPACK",
"directions": 4
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-medical-equipped-BACKPACK",
"directions": 4
},
{
"name": "courier-medical",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-science-equipped-BACKPACK",
"directions": 4
},
{
"name": "courier-science",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-security-equipped-BACKPACK",
"directions": 4
},
{
"name": "courier-security",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "courier-virology",
"directions": 1
},
{
"name": "courier-virology-equipped-BACKPACK",
"directions": 4
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "satchel-equipped-BACKPACK",
"directions": 4
},
{
"name": "satchel",
"directions": 1
}
]
}

View File

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 322 B

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "satchel-captain-equipped-BACKPACK",
"directions": 4
},
{
"name": "satchel-captain",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "satchel-chemistry-equipped-BACKPACK",
"directions": 4
},
{
"name": "satchel-chemistry",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "satchel-engineering-equipped-BACKPACK",
"directions": 4
},
{
"name": "satchel-engineering",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "satchel-genetics-equipped-BACKPACK",
"directions": 4
},
{
"name": "satchel-genetics",
"directions": 1
}
]
}

View File

@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "satchel-hydroponics-equipped-BACKPACK",
"directions": 4
},
{
"name": "satchel-hydroponics",
"directions": 1
}
]
}

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