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

Implement gridinv, proper #703

Merged
merged 4 commits into from
Jan 21, 2024
Merged

Implement gridinv, proper #703

merged 4 commits into from
Jan 21, 2024

Conversation

DebugOk
Copy link
Contributor

@DebugOk DebugOk commented Jan 21, 2024

About the PR

Implements gridinv, thats about it. (And also like 1 or 2 commits I apparently forgot)

Why / Balance

I really couldn’t keep avoiding this change if I wanted to keep doing upstream merges easily. I know I made a promise I would avoid this, but it was always a “For as long as possible” thing. I don’t like having to do this either, and I know some people really hate gridinv, and I’m sorry for that. The only way we could keep using the old system is if someone rewrote a ton of code, which I’m not willing to do.

Technical Details

Because I had to revert to October and repick all of the merges I did, I had like 1500 commits pending, which github didn’t like. Instead, I’ve squashed them all into 1 and applied that on top of the current master, fixing any conflicts that created. It seems to have worked, but I’ll still need time to review this pr just in case that resulted in anything weird.

Breaking changes

Its gridinv, any prs adding items/storage that specify stuff using the old values will need to be modified. But it shouldn’t™ break anything beyond that.

Changelog
Make sure to take this Changelog template out of the comment block in order for it to show up.
🆑

  • add: Added gridinv, sorry.

@DebugOk DebugOk requested a review from IamVelcroboy as a code owner January 21, 2024 12:32
@github-actions github-actions bot added S: Needs Review Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI labels Jan 21, 2024
@DebugOk
Copy link
Contributor Author

DebugOk commented Jan 21, 2024

I have read over all of the changes, and I believe there shouldn't be anything unintended in here except persistance being added. Oh well, fuck it.

Sorry to everyone who hates gridinv. I would've loved to keep avoiding this.

@DebugOk DebugOk merged commit 18f0af1 into DeltaV-Station:master Jan 21, 2024
10 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Jan 21, 2024
@deltanedas
Copy link
Member

persistence doesnt matter since you have to enable it in server config

@DebugOk
Copy link
Contributor Author

DebugOk commented Jan 21, 2024

persistence doesnt matter since you have to enable it in server config

Yeah, just saying cause it got squashed in with the rest and I was too lazy to undo it

LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description

Just some regular cleanup of PsionicSystem and PsionicAbilitiesSystem.
No refactoring today, just cleanup. Tomorrow I will serialize this shit,
assuming this gets merged.

No media because there's nothing to show. No changelog because this
isn't playerfacing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants