-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New solar sprites, new solar panel upgrades, and some solar panel fix…
…es. (#29224) * New solar sprites, new solar panel upgrades, and some solar panel fixes. This adds and changes a few things for solar panels! * New sprites for all solar panels and all related states. * Move from xform.WorldRotation to _xformSystem.SetWorldRotation within the solar code. * Few random fixes that Rider suggested as warnings. * Solar Tracker Electronics was using what looks like to be the airlock controller electronics, so that's now updated to something a bit more realistic. It also uses the engineering circuit sprite instead of the generic * New Solar Panels! Adds Plasma and Uranium Glass solar panels. These can be constructed by adding the respective glass to the panel. Plasma is a slight increase of power and health, and uranium is double the power and health of glass. Thus giving engineers something to update if they want to use solar panels and possibly giving small outposts a way to make a bit more power without a large and complex power setup. * Add in solar sprites that were not in the meta file. * Updated sprites based on feedback. * Fix the rotation of the solar panel sprites.
- Loading branch information
Showing
24 changed files
with
265 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-291 Bytes
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png
Binary file not shown.
54 changes: 42 additions & 12 deletions
54
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,60 @@ | ||
{ | ||
"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.", | ||
"license":"CC-BY-SA-4.0", | ||
"copyright":"KalimbaMachine (github) & CaasGit (github) for Space Station 14", | ||
"size":{"x":32,"y":32}, | ||
"states": | ||
[ | ||
{ | ||
"name": "normal", | ||
"select": [], | ||
"flags": {}, | ||
"directions": 8 | ||
"name": "solar_assembly" | ||
}, | ||
{ | ||
"name": "broken", | ||
"select": [], | ||
"flags": {}, | ||
"directions": 1 | ||
"name": "solar_assembly_tracker_circuit" | ||
}, | ||
{ | ||
"name": "static" | ||
"name": "solar_panel_glass_broken" | ||
}, | ||
{ | ||
"name": "solar_assembly" | ||
"name": "solar_panel_plasma_broken" | ||
}, | ||
{ | ||
"name": "solar_panel_uranium_broken" | ||
}, | ||
{ | ||
"name": "solar_panel_glass" | ||
}, | ||
{ | ||
"name": "solar_panel_plasma" | ||
}, | ||
{ | ||
"name": "solar_panel_uranium" | ||
}, | ||
{ | ||
"name": "solar_tracker" | ||
}, | ||
{ | ||
"name": "solar_tracker_broken" | ||
}, | ||
{ | ||
"name": "solar_assembly_uncabled" | ||
}, | ||
{ | ||
"name": "solar_assembly_tracker_circuit_uncabled" | ||
}, | ||
{ | ||
"name": "solar_panel_glass_uncabled" | ||
}, | ||
{ | ||
"name": "solar_panel_plasma_uncabled" | ||
}, | ||
{ | ||
"name": "solar_panel_uranium_uncabled" | ||
}, | ||
{ | ||
"name": "solar_tracker_uncabled" | ||
}, | ||
{ | ||
"name": "solar_tracker_broken_uncabled" | ||
} | ||
] | ||
} |
Binary file removed
BIN
-886 Bytes
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png
Binary file not shown.
Binary file modified
BIN
+563 Bytes
(280%)
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_assembly.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 added
BIN
+1.29 KB
.../Structures/Power/Generation/solar_panel.rsi/solar_assembly_tracker_circuit.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 added
BIN
+1.24 KB
...es/Power/Generation/solar_panel.rsi/solar_assembly_tracker_circuit_uncabled.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 added
BIN
+801 Bytes
...extures/Structures/Power/Generation/solar_panel.rsi/solar_assembly_uncabled.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 added
BIN
+880 Bytes
...rces/Textures/Structures/Power/Generation/solar_panel.rsi/solar_panel_glass.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 added
BIN
+1.11 KB
...xtures/Structures/Power/Generation/solar_panel.rsi/solar_panel_glass_broken.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 added
BIN
+843 Bytes
...ures/Structures/Power/Generation/solar_panel.rsi/solar_panel_glass_uncabled.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 added
BIN
+837 Bytes
...ces/Textures/Structures/Power/Generation/solar_panel.rsi/solar_panel_plasma.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 added
BIN
+1.11 KB
...tures/Structures/Power/Generation/solar_panel.rsi/solar_panel_plasma_broken.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 added
BIN
+798 Bytes
...res/Structures/Power/Generation/solar_panel.rsi/solar_panel_plasma_uncabled.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 added
BIN
+911 Bytes
...es/Textures/Structures/Power/Generation/solar_panel.rsi/solar_panel_uranium.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 added
BIN
+1.13 KB
...ures/Structures/Power/Generation/solar_panel.rsi/solar_panel_uranium_broken.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 added
BIN
+879 Bytes
...es/Structures/Power/Generation/solar_panel.rsi/solar_panel_uranium_uncabled.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
BIN
+536 Bytes
(210%)
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.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 added
BIN
+1.52 KB
...s/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker_broken.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 added
BIN
+1.53 KB
...s/Structures/Power/Generation/solar_panel.rsi/solar_tracker_broken_uncabled.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 added
BIN
+1 KB
...Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker_uncabled.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 removed
BIN
-223 Bytes
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/static.png
Binary file not shown.