Respriting the codebase (#4820)
* Walls * Airlocks mostly ported * Disposal Unit * Tiles * Lighting * Catwalk * Windows * Some vending machine work * More Vending Machines * Rest of vending machine sprites ported * Fixes to vending machines * Tables (This took a lot of work) * Fixes low walls being required for window smoothing - Also replaces window damage visualization * Plasma Window * APC * SMES + Reorganized parts.yml * Furniture and Organization and Removed Shelf * Renamed seats.yml to chairs.yml * Dispensers * Lazy-fixed the glass airlocks * Don't need this no more * Tilez * blue circuit my fucking beloved * Switches lights to cev one * Conveyors and Switch * Reorients lights * !ALERT! MAP CHANGES !ALERT! Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
|
Before Width: | Height: | Size: 704 B |
|
Before Width: | Height: | Size: 966 B |
|
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 370 B |
|
Before Width: | Height: | Size: 296 B |
|
Before Width: | Height: | Size: 299 B |
|
Before Width: | Height: | Size: 536 B |
|
Before Width: | Height: | Size: 329 B |
|
Before Width: | Height: | Size: 335 B |
|
Before Width: | Height: | Size: 575 B |
|
Before Width: | Height: | Size: 523 B |
|
Before Width: | Height: | Size: 470 B |
|
Before Width: | Height: | Size: 483 B |
|
Before Width: | Height: | Size: 101 B After Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 156 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 158 B |
|
Before Width: | Height: | Size: 101 B After Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 156 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 158 B |
|
Before Width: | Height: | Size: 101 B After Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 156 B |
|
Before Width: | Height: | Size: 102 B After Width: | Height: | Size: 158 B |
|
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 282 B |
|
Before Width: | Height: | Size: 358 B After Width: | Height: | Size: 434 B |
|
Before Width: | Height: | Size: 280 B After Width: | Height: | Size: 275 B |
BIN
Resources/Textures/Structures/Power/apc.rsi/apco3-3.png
Normal file
|
After Width: | Height: | Size: 337 B |
|
Before Width: | Height: | Size: 107 B After Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 106 B After Width: | Height: | Size: 155 B |
BIN
Resources/Textures/Structures/Power/apc.rsi/broken.png
Normal file
|
After Width: | Height: | Size: 673 B |
BIN
Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
Normal file
|
After Width: | Height: | Size: 387 B |
@@ -1,137 +1,127 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "broken"
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "apc-b"
|
||||
},
|
||||
{
|
||||
"name": "apc-spark",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apc0"
|
||||
},
|
||||
{
|
||||
"name": "apc1"
|
||||
},
|
||||
{
|
||||
"name": "apc1-b-nocover"
|
||||
},
|
||||
{
|
||||
"name": "apc1-nocover"
|
||||
},
|
||||
{
|
||||
"name": "apc2"
|
||||
},
|
||||
{
|
||||
"name": "apc2-b-nocover"
|
||||
},
|
||||
{
|
||||
"name": "apc2-nocover"
|
||||
},
|
||||
{
|
||||
"name": "apcemag",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apcewires"
|
||||
},
|
||||
{
|
||||
"name": "apcmaint"
|
||||
},
|
||||
{
|
||||
"name": "apco0-0"
|
||||
},
|
||||
{
|
||||
"name": "apco0-1"
|
||||
},
|
||||
{
|
||||
"name": "apco0-2"
|
||||
},
|
||||
{
|
||||
"name": "apco0-3"
|
||||
},
|
||||
{
|
||||
"name": "apco1-0"
|
||||
},
|
||||
{
|
||||
"name": "apco1-1"
|
||||
},
|
||||
{
|
||||
"name": "apco1-2"
|
||||
},
|
||||
{
|
||||
"name": "apco1-3"
|
||||
},
|
||||
{
|
||||
"name": "apco2-0"
|
||||
},
|
||||
{
|
||||
"name": "apco2-1"
|
||||
},
|
||||
{
|
||||
"name": "apco2-2"
|
||||
},
|
||||
{
|
||||
"name": "apco2-3"
|
||||
},
|
||||
{
|
||||
"name": "apco3-0",
|
||||
"delays": [
|
||||
[
|
||||
1.0,
|
||||
2.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apco3-1",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.2
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apco3-2",
|
||||
"delays": [
|
||||
[
|
||||
1.0,
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apcox-0"
|
||||
},
|
||||
{
|
||||
"name": "apcox-1"
|
||||
}
|
||||
]
|
||||
{
|
||||
"name": "sparks-unlit",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apc0"
|
||||
},
|
||||
{
|
||||
"name": "emag-unlit",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "panel"
|
||||
},
|
||||
{
|
||||
"name": "apco0-0"
|
||||
},
|
||||
{
|
||||
"name": "apco0-1"
|
||||
},
|
||||
{
|
||||
"name": "apco0-2"
|
||||
},
|
||||
{
|
||||
"name": "apco0-3"
|
||||
},
|
||||
{
|
||||
"name": "apco1-0"
|
||||
},
|
||||
{
|
||||
"name": "apco1-1"
|
||||
},
|
||||
{
|
||||
"name": "apco1-2"
|
||||
},
|
||||
{
|
||||
"name": "apco1-3"
|
||||
},
|
||||
{
|
||||
"name": "apco2-0"
|
||||
},
|
||||
{
|
||||
"name": "apco2-1"
|
||||
},
|
||||
{
|
||||
"name": "apco2-2"
|
||||
},
|
||||
{
|
||||
"name": "apco2-3"
|
||||
},
|
||||
{
|
||||
"name": "apco3-0",
|
||||
"delays": [
|
||||
[
|
||||
1,
|
||||
2
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apco3-1",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.2
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apco3-2",
|
||||
"delays": [
|
||||
[
|
||||
1,
|
||||
1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apco3-3",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "apcox-0"
|
||||
},
|
||||
{
|
||||
"name": "apcox-1"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
BIN
Resources/Textures/Structures/Power/apc.rsi/panel.png
Normal file
|
After Width: | Height: | Size: 142 B |
BIN
Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png
Normal file
|
After Width: | Height: | Size: 749 B |
@@ -1 +1,74 @@
|
||||
{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"smes","select":[],"flags":{},"directions":1},{"name":"smes-display","select":[],"flags":{},"directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2]]},{"name":"smes-crit","select":[],"flags":{},"directions":1,"delays":[[0.2,0.2,0.2,0.2]]},{"name":"smes-oc0","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-oc1","select":[],"flags":{},"directions":1,"delays":[[0.5,0.5]]},{"name":"smes-oc2","select":[],"flags":{},"directions":1,"delays":[[0.5,0.5]]},{"name":"smes-og1","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og2","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og3","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og4","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og5","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-op0","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-op1","select":[],"flags":{},"directions":1,"delays":[[1,1]]},{"name":"smes-op2","select":[],"flags":{},"directions":1,"delays":[[1]]}]}
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "smes"
|
||||
},
|
||||
{
|
||||
"name": "smes-open"
|
||||
},
|
||||
{
|
||||
"name": "smes-oc0"
|
||||
},
|
||||
{
|
||||
"name": "smes-oc1",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "smes-oc2",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "smes-og1",
|
||||
"delays": [
|
||||
[
|
||||
1,
|
||||
1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "smes-og2"
|
||||
},
|
||||
{
|
||||
"name": "smes-og3"
|
||||
},
|
||||
{
|
||||
"name": "smes-og4"
|
||||
},
|
||||
{
|
||||
"name": "smes-og5"
|
||||
},
|
||||
{
|
||||
"name": "smes-op0"
|
||||
},
|
||||
{
|
||||
"name": "smes-op1",
|
||||
"delays": [
|
||||
[
|
||||
1,
|
||||
1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "smes-op2"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 721 B |
|
Before Width: | Height: | Size: 514 B |
|
Before Width: | Height: | Size: 127 B After Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 134 B After Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 134 B After Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 120 B After Width: | Height: | Size: 101 B |
|
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 155 B |
|
Before Width: | Height: | Size: 179 B After Width: | Height: | Size: 160 B |
|
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 194 B |
|
Before Width: | Height: | Size: 249 B After Width: | Height: | Size: 200 B |
|
Before Width: | Height: | Size: 115 B After Width: | Height: | Size: 106 B |
|
Before Width: | Height: | Size: 171 B After Width: | Height: | Size: 143 B |
|
Before Width: | Height: | Size: 127 B After Width: | Height: | Size: 111 B |
BIN
Resources/Textures/Structures/Power/smes.rsi/smes-open.png
Normal file
|
After Width: | Height: | Size: 967 B |
|
Before Width: | Height: | Size: 581 B After Width: | Height: | Size: 869 B |