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

Port Supermatter Updates From Impstation #1719

Merged
merged 9 commits into from
Feb 17, 2025

Conversation

VMSolidus
Copy link
Member

Description

Yea it turns out ImpStation made a shitton of updates to Supermatter that were never upstreamed, including making a fancy new Supermatter Monitoring Console, which needs to be mapped. Technically this is a DeltaV PR, but out of pure spite I ported the entirety of this completely by hand.

Media

image

Changelog

🆑

  • add: Added Supermatter Monitoring Console.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI Changes: Audio Changes any ogg files labels Feb 5, 2025
Copy link
Contributor

github-actions bot commented Feb 5, 2025

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

Resources/Textures/Supermatter/supermatter.rsi

State Old New Status
supermatter Removed

Resources/Textures/_EE/Structures/Machines/computers.rsi

State Old New Status
computer Added
generic_keyboard Added
generic_panel_open Added
supermatter-0 Added
supermatter-1 Added
supermatter-2 Added
supermatter-3 Added
supermatter-4 Added
supermatter-5 Added
supermatter-6 Added
supermatter_keys Added

Resources/Textures/_EE/Structures/Power/Generation/Supermatter/supermatter.rsi

State Old New Status
supermatter Added

Edit: diff updated after 36ef0d5

@stellar-novas
Copy link
Contributor

YAML linter fail is real

@VMSolidus
Copy link
Member Author

linter fail Was real.

@stellar-novas
Copy link
Contributor

And we're keeping everything in the _EE namespace now?

@VMSolidus
Copy link
Member Author

Yes

image

@stellar-novas
Copy link
Contributor

THE LINTER

Btw you can run it locally with the runTestsYAML script

@VMSolidus
Copy link
Member Author

THE LINTER

Btw you can run it locally with the runTestsYAML script

I'm so unfathomably lazy that I would rather just let the github runners do it for me while I shitpost on other people's discord servers.

@stellar-novas
Copy link
Contributor

Fair enough

@AftrLite
Copy link

AftrLite commented Feb 8, 2025

We've some extra Soup Crystal spritesheets over on ImpStation as well, if you're interested. Animations for when it's delamming 'n such! 😄

@VMSolidus VMSolidus merged commit 541f169 into Simple-Station:master Feb 17, 2025
12 of 13 checks passed
SimpleStation14 added a commit that referenced this pull request Feb 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files 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.

4 participants