Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adds material and singularity cargo crates (#3445)

Browse Source 
* Adds various crates

* Removes redundant code from EmitterComponent.cs

* (fixed) emitter

* Hopefully good

* Update meta.json
This commit is contained in:
Swept
2021-02-28 19:57:44 +00:00
committed by GitHub
parent 7e6fbc0b48
commit 6df41b2fa7
63 changed files with 608 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_active.png → Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_active.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1021 B

After

Width:  |  Height:  |  Size: 1021 B

0
Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_deactive.png → Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_deactive.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 986 B

After

Width:  |  Height:  |  Size: 986 B

0
Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_off.png → Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_off.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 563 B

0
Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_on.png → Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_on.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 712 B

0
Resources/Textures/Constructible/Power/radiation_collector.rsi/cu.png → Resources/Textures/Constructible/Power/Singularity/collector.rsi/cu.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 558 B

44
Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json Normal file
View File

@@ -0,0 +1,44 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/commit/cbe076402ed43b1cd861295bbcb95608c453de7a",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "ca_off"
},
{
"name": "ca_on"
},
{
"name": "ca_active",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "ca_deactive",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "cu"
}
]
}

0
Resources/Textures/Constructible/Power/field_generator.rsi/+a1.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/a1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 138 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+a2.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/a2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 147 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+a3.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/a3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 148 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/Field_Gen.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 977 B

After

Width:  |  Height:  |  Size: 977 B

44
Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json Normal file
View File

@@ -0,0 +1,44 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "a1"
},
{
"name": "a2"
},
{
"name": "a3"
},
{
"name": "on"
},
{
"name": "p1"
},
{
"name": "p2"
},
{
"name": "p3"
},
{
"name": "p4"
},
{
"name": "p5"
},
{
"name": "p6"
},
{
"name": "icon"
}
]
}

0
Resources/Textures/Constructible/Power/field_generator.rsi/+on.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/on.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 416 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+p1.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/p1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 B

After

Width:  |  Height:  |  Size: 122 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+p2.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/p2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 124 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+p3.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/p3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+p4.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/p4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 135 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+p5.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/p5.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 136 B

0
Resources/Textures/Constructible/Power/field_generator.rsi/+p6.png → Resources/Textures/Constructible/Power/Singularity/containment.rsi/p6.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 136 B

0
Resources/Textures/Effects/contain_f.rsi/Contain_F.png → Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/field.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

89
Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json Normal file
View File

@@ -0,0 +1,89 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "field",
"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,
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
Resources/Textures/Constructible/Power/emitter.rsi/emitter-beam.png → Resources/Textures/Constructible/Power/Singularity/emitter.rsi/beam.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

0
Resources/Textures/Constructible/Power/emitter.rsi/emitter0.png → Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
Resources/Textures/Constructible/Power/emitter.rsi/emitter1.png → Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
Resources/Textures/Constructible/Power/emitter.rsi/emitter2.png → Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
Resources/Textures/Constructible/Power/emitter.rsi/emitter-lock.png → Resources/Textures/Constructible/Power/Singularity/emitter.rsi/lock.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

56
Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json Normal file
View File

@@ -0,0 +1,56 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "beam",
"directions": 4
},
{
"name": "underpowered",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
},
{
"name": "lock",
"directions": 4
},
{
"name": "emitter0",
"directions": 4
},
{
"name": "emitter1",
"directions": 4
},
{
"name": "emitter2",
"directions": 4
},
{
"name": "projectile"
}
]
}

0
Resources/Textures/Constructible/Power/emitter.rsi/emitter_projectile.png → Resources/Textures/Constructible/Power/Singularity/emitter.rsi/projectile.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 265 B

0
Resources/Textures/Constructible/Power/emitter.rsi/emitter-underpowered.png → Resources/Textures/Constructible/Power/Singularity/emitter.rsi/underpowered.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 651 B

After

Width:  |  Height:  |  Size: 651 B

0
Resources/Textures/Effects/Singularity/singulo_gen.rsi/singulo_gen.png → Resources/Textures/Constructible/Power/Singularity/generator.rsi/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

14
Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json Normal file
View File

@@ -0,0 +1,14 @@
{
"version": 1,
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/68357f0b64a296d122ff1bdb2f13e9b0cb04a003/icons/obj/singularity.dmi",
"license": "CC-BY-SA-3.0",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}

0
Resources/Textures/Effects/Singularity/singularity_1.rsi/meta.json → Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/meta.json
View File

0
Resources/Textures/Effects/Singularity/singularity_1.rsi/singularity_1.png → Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/singularity_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
Resources/Textures/Effects/Singularity/singularity_2.rsi/meta.json → Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/meta.json
View File

0
Resources/Textures/Effects/Singularity/singularity_2.rsi/singularity_2.png → Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/singularity_2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

0
Resources/Textures/Effects/Singularity/singularity_3.rsi/meta.json → Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/meta.json
View File

0
Resources/Textures/Effects/Singularity/singularity_3.rsi/singularity_3.png → Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/singularity_3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 204 KiB

After

Width:  |  Height:  |  Size: 204 KiB

0
Resources/Textures/Effects/Singularity/singularity_4.rsi/meta.json → Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/meta.json
View File

0
Resources/Textures/Effects/Singularity/singularity_4.rsi/singularity_4.png → Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/singularity_4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 KiB

After

Width:  |  Height:  |  Size: 301 KiB

0
Resources/Textures/Effects/Singularity/singularity_5.rsi/meta.json → Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/meta.json
View File

0
Resources/Textures/Effects/Singularity/singularity_5.rsi/singularity_5.png → Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/singularity_5.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 429 KiB

After

Width:  |  Height:  |  Size: 429 KiB

0
Resources/Textures/Effects/Singularity/singularity_6.rsi/meta.json → Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/meta.json
View File

0
Resources/Textures/Effects/Singularity/singularity_6.rsi/singularity_6.png → Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/singularity_6.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

1
Resources/Textures/Constructible/Power/emitter.rsi/meta.json
View File

@@ -1 +0,0 @@
{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/tgstation/tgstation","states":[{"name":"emitter-beam","directions":4,"delays":[[0.1],[0.1],[0.1],[0.1]]},{"name":"emitter-underpowered","directions":4,"delays":[[0.1,0.1],[0.1,0.1],[0.1,0.1],[0.1,0.1]]},{"name":"emitter-lock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emitter0","directions":4,"delays":[[0.1],[0.1],[0.1],[0.1]]},{"name":"emitter1","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emitter2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emitter_projectile","directions":1,"delays":[[1.0]]}]}

1
Resources/Textures/Constructible/Power/field_generator.rsi/meta.json
View File

@@ -1 +0,0 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation", "states": [{"name": "+a1", "delays": [[1.0]]}, {"name": "+a2", "delays": [[1.0]]}, {"name": "+a3", "delays": [[1.0]]}, {"name": "+on", "delays": [[1.0]]}, {"name": "+p1", "delays": [[1.0]]}, {"name": "+p2", "delays": [[1.0]]}, {"name": "+p3", "delays": [[1.0]]}, {"name": "+p4", "delays": [[1.0]]}, {"name": "+p5", "delays": [[1.0]]}, {"name": "+p6", "delays": [[1.0]]}, {"name": "Field_Gen", "delays": [[1.0]]}]}

1
Resources/Textures/Constructible/Power/radiation_collector.rsi/meta.json
View File

@@ -1 +0,0 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/goonstation/goonstation-2020", "states": [{"name": "ca_off", "delays": [[1.0]]}, {"name": "ca_on", "delays": [[1.0]]}, {"name": "ca_active", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ca_deactive", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "cu", "delays": [[1.0]]}]}

1
Resources/Textures/Effects/Singularity/singulo_gen.rsi/meta.json
View File

@@ -1 +0,0 @@
{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/68357f0b64a296d122ff1bdb2f13e9b0cb04a003/icons/obj/singularity.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singulo_gen","directions":1,"delays":[[1]]}]}

1
Resources/Textures/Effects/contain_f.rsi/meta.json
View File

@@ -1 +0,0 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation", "states": [{"name": "Contain_F", "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, 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]]}]}