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

New Solar Sprites, New Solar Panel Upgrades, and some Solar Panel Fixes #1677

Merged
merged 3 commits into from
Jan 30, 2025

Conversation

sleepyyapril
Copy link
Contributor

port space-wizards/space-station-14#29224

🆑 CaasGit

  • add: Solar panels can now be upgraded with plasma or uranium glass.

…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.
@sleepyyapril sleepyyapril requested a review from Remuchi as a code owner January 28, 2025 00:29
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 28, 2025
@SimpleStation14 SimpleStation14 changed the title New solar sprites, new solar panel upgrades, and some solar panel fixes New Solar Sprites, New Solar Panel Upgrades, and some Solar Panel Fixes Jan 28, 2025
Copy link
Contributor

github-actions bot commented Jan 28, 2025

RSI Diff Bot; head commit af8890f merging into ee9802c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Power/Generation/solar_panel.rsi

State Old New Status
solar_assembly Modified
solar_tracker Modified
broken Removed
normal Removed
static Removed
solar_assembly_tracker_circuit Added
solar_assembly_tracker_circuit_uncabled Added
solar_assembly_uncabled Added
solar_panel_glass Added
solar_panel_glass_broken Added
solar_panel_glass_uncabled Added
solar_panel_plasma Added
solar_panel_plasma_broken Added
solar_panel_plasma_uncabled Added
solar_panel_uranium Added
solar_panel_uranium_broken Added
solar_panel_uranium_uncabled Added
solar_tracker_broken Added
solar_tracker_broken_uncabled Added
solar_tracker_uncabled Added

Edit: diff updated after af8890f

Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to literally quadruple the power stats of all 3, because these wizden numbers are still garbage even "upgraded". Keep in mind we had previously 4x'd them, but wizden didn't, so the uranium panels are half the power output of buffed panels on EE.

@VMSolidus VMSolidus merged commit d58c83d into Simple-Station:master Jan 30, 2025
12 of 13 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants