Skip to content

Commit

Permalink
Power Resprite (#520)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

**FIGHT THE POWER WITH THE POWER!**

Here is a major resprite for most power related things, mostly for SMES,
APC, Airlarm, ect...
Wizden made PRs horible to look at, lets not make that mistake here!

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] SMES
- [x] APC
- [x] Airalarm
- [x] Cameras
- [x] LightTube
- [x] Intercom
- [x] FireAlarm
- [x] Substation

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/df32082e-e7ed-46c2-b9c9-09b29a219fbe)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/1849f5d4-7150-4af2-8cc0-d442ac9ca741)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: FoxxoTrrystan
- tweak: Power Resprites! (New SMES, APC, Airlarm, Camera, Substation,
LightTube, Intercom, FireAlarm and Substation)
  • Loading branch information
FoxxoTrystan authored Jul 9, 2024
1 parent 408ab5d commit 6affbc1
Show file tree
Hide file tree
Showing 93 changed files with 586 additions and 272 deletions.
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

0 comments on commit 6affbc1

Please sign in to comment.