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.

Before

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 573 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

View File

@@ -1,81 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13",
"states": [
{
"name": "head_m",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "torso_m",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_arm",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_arm",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_hand",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_hand",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_leg",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_leg",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_foot",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_foot",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

View File

@@ -1,53 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13",
"states": [
{
"name": "brain_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "eyes_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "heart_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "kidneys_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "liver_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "lungs_human",
"directions": 1,
"delays": [
[1.0]
]
},
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

View File

@@ -1,747 +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": "beaker",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "beakerbluespace",
"directions": 1,
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "beakerlarge",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "beaker-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "beaker-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "beakernoreact",
"directions": 1,
"delays": [
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
]
]
},
{
"name": "bottle",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle-1",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle-2",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle-3",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle-4",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle1",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle10",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle11",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle12",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle13",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle14",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle15",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle16",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle17",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle18",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle19",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle2",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle20",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle3",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle4",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle5",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle6",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle7",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle8",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "bottle9",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "chemg",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "chemg_armed",
"directions": 1,
"delays": [
[
0.1,
0.2
]
]
},
{
"name": "chemg_ass",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "chemg_locked",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "chempuff",
"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
]
]
},
{
"name": "dropper",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "large_grenade",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "large_grenade_armed",
"directions": 1,
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "large_grenade_ass",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "large_grenade_locked",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lid_beaker",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lid_beakerlarge",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lid_beakernoreact",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lid_bottle",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "lid_vial",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "molten",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill1",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill10",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill11",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill12",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill13",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill14",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill15",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill16",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill17",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill18",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill19",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill2",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill20",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill3",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill4",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill5",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill6",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill7",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill8",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill9",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "pill_canister",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "syringeproj",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "vial",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "weedpuff",
"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
]
]
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

View File

Before

Width:  |  Height:  |  Size: 464 B

After

Width:  |  Height:  |  Size: 464 B

View File

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 566 B

View File

Before

Width:  |  Height:  |  Size: 803 B

After

Width:  |  Height:  |  Size: 803 B

View File

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 276 B

View File

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 309 B

View File

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 316 B

View File

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

View File

Before

Width:  |  Height:  |  Size: 464 B

After

Width:  |  Height:  |  Size: 464 B

View File

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 379 B

View File

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 287 B

View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

View File

Before

Width:  |  Height:  |  Size: 452 B

After

Width:  |  Height:  |  Size: 452 B

View File

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 319 B

View File

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 384 B

View File

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

View File

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

View File

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 676 B

View File

Before

Width:  |  Height:  |  Size: 288 B

After

Width:  |  Height:  |  Size: 288 B

View File

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 486 B

View File

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 520 B

View File

Before

Width:  |  Height:  |  Size: 477 B

After

Width:  |  Height:  |  Size: 477 B

View File

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 349 B

View File

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 310 B

View File

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 371 B

View File

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 416 B

View File

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 420 B

View File

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 177 B

View File

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

View File

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 299 B

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