Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Power Resprite #520

Merged
merged 7 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Resources/Textures/Structures/Power/apc.rsi/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/broken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/display-charging.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/display-full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/display-lack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/display-remote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Structures/Power/apc.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"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",
"copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fca7f2a0f9154c0c6c4efc2f8f58441fb9b34759",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/apc.rsi/static.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Structures/Power/power.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation",
"copyright": "Taken from tgstation/paradise",
"states": [
{
"name": "eightdirwire"
Expand Down
Binary file modified Resources/Textures/Structures/Power/power.rsi/storage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 40 additions & 30 deletions Resources/Textures/Structures/Power/smes.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,17 @@
{
"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",
"copyright": "Taken from Paradise at https://github.com/McRamon/Paradise/blob/b727162ed9dead12de42be5c5b04872934a474e1/icons/obj/power.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "smes"
},
{
"name": "static"
},
{
"name": "smes-open"
},
{
"name": "smes-oc0"
},
{
"name": "smes-oc1",
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "smes-oc2",
"delays": [
[
0.5,
0.5
]
]
"name": "static"
},
{
"name": "smes-og1",
Expand All @@ -62,16 +38,50 @@
"name": "smes-op0"
},
{
"name": "smes-op1",
"name": "smes-op1"
},
{
"name": "smes-op2"
},
{
"name": "smes-oc1",
"delays": [
[
1,
1
0.3,
0.3
]
]
},
{
"name": "smes-op2"
"name": "smes-oc2",
"delays": [
[
0.3,
0.3
]
]
},
{
"name": "smes-oc0",
"delays": [
[
0.5,
0.3
]
]
},
{
"name": "smes-open",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-og1.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-og2.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-og3.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-og4.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-og5.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-op0.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-op1.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-op2.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes-open.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/smes.png
Binary file modified Resources/Textures/Structures/Power/smes.rsi/static.png
Binary file modified Resources/Textures/Structures/Power/substation.rsi/charging.png
Binary file modified Resources/Textures/Structures/Power/substation.rsi/dead.png
Binary file modified Resources/Textures/Structures/Power/substation.rsi/full.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Drawn by Ubaser.",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/b63634bc17efe2f09cf06ef0e9a90d24d37f6203, wall modified by Peptide90",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Power/substation.rsi/screen.png
Binary file modified Resources/Textures/Structures/Power/substation.rsi/substation.png
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
"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",
Expand All @@ -16,14 +16,14 @@
"directions": 4
},
{
"name": "base",
"name": "empty",
"directions": 4
},
{
"name": "empty",
"name": "base",
"directions": 4
},
{
{
"name": "glow",
"directions": 4
}
Expand Down
Loading
Loading