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

Psionics #44

Merged
merged 33 commits into from
Oct 8, 2023
Merged

Psionics #44

merged 33 commits into from
Oct 8, 2023

Conversation

PHCodes
Copy link
Contributor

@PHCodes PHCodes commented Sep 27, 2023

It's a ton of stuff relating to the basic Psionics system and all the powers.

The merge is completed.

There is still some issues with Invisibility. I commented out the line that makes it so that people who were able to see the invisible who are now unable to toggles so that they can't. Something to do with the bit shifting being off now that it's been changed from an unsigned integer to an integer. The fault in our bits.

Here's a short list of the things I implemented, or tried to at least:
All of the Psionic powers (except mime's).
Got the glimmer probers working and glowing (I uh, think. They hum and raise glimmer at least. no construction, though).
Noospheric Storm and all other psionic-related game rules (events) implemented.
Added the PotentiallyPsionic tag to every morphotype I could (don't know if Vulpakin got it/will need to be added if we're missing any other races).
Got the Psionic faction chat working. (MOST of the existing upstream code edits were related to this. Was sad. And bad. Need .yml configurations for our chat channels!)
Liquids. Mind Breaker and Cryptobiolin should now interact as they're supposed to for Psionics. Prometheum and Lapothogoi oil should be implemented.
Psionic dream whispering.
Probably a bunch of other stuff I'm forgetting about. Note that I only really tested the Faction chat, Dreams, Powers, Probers, and the Game Rules extensively. Everything else was thrown on when I spotted it but in the interest of time I decided to move forward.

Anyway, here's a short list of the psionically-tangent things I noted but for the sake of my sanity didn't mess with:
image

About the PR

I put almost everything that makes psionic systems work and some of their minor features and powers back into the game.

Why / Balance

Needed to reintroduce psionics.
The rebase code had no psionics.

Technical details

Reimplements the code from Nyanotrasen. The biggest difference between old and new is the Actions system rework.

Media

I'm tired man. Here's the powers.
ActionsWorking
ActionsWorking2

  • [X ] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

It builds. As far as I know there are no breaking changes.

Changelog

🆑

  • add: Readded psionics systems and powers.

It's a ton of stuff relating to the basic Psionics system and all the powers.

I'm saving this as a bit of a sanity check before moving forward.

Left to do:
1. Implementing the Psionic faction so that the chat works as intended.
2. Adding the start-state cooldown timers to the actions.
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Sep 28, 2023
It's a ton of stuff relating to the basic Psionics system and all the powers.

I'm saving this as a bit of a sanity check before moving forward.

Left to do:
1. Implementing the Psionic faction so that the chat works as intended.
2. Adding the start-state cooldown timers to the actions.
Got the psionic chat working. Got some other stuff working
The last batch of content.
Got the psionic chat working. Got some other stuff working
With these changes in place, the unit does not work. Recording them so i don't lose my work.
Dawn of the final Commit. Rebase completed.
@PHCodes
Copy link
Contributor Author

PHCodes commented Sep 28, 2023

I'm ready for other human beings to look at this. I think.

@DebugOk DebugOk self-requested a review October 1, 2023 19:53
DebugOk
DebugOk previously requested changes Oct 1, 2023
Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

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

There are several files in Content.Server/Nyanotrasen/Station Events/

There shouldn't be a space there

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 2, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 2, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@DebugOk DebugOk dismissed their stale review October 4, 2023 19:25

Re-review needed

@DebugOk DebugOk self-requested a review October 4, 2023 19:26
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 5, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@DebugOk
Copy link
Contributor

DebugOk commented Oct 5, 2023

Merge conflict because @FluffiestFloof also added DogVision

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 5, 2023
@DebugOk
Copy link
Contributor

DebugOk commented Oct 5, 2023

There is literally so much I'd have to test I'd rather just merge it and see what breaks first lol

DebugOk
DebugOk previously requested changes Oct 5, 2023
Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

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

Theres a lot not marked properly as changed we made.

Anything changed should for single lines have a comment in the format DeltaV - Summary or Nyano - Summary

Or for large blocks of code, DeltaV/Nyano - Summary - Begin modified code block and DeltaV/Nyano - End modified code block

This way we can keep everything more maintainable by not having to blame something to see if its a local change or not

@DebugOk
Copy link
Contributor

DebugOk commented Oct 5, 2023

It'd be easier to review if this was split into multiple smaller prs, but seeing as I don't want to put more work on you, just adding the comments to base files should be enough for now. Any other issues can be worked on later

@PHCodes
Copy link
Contributor Author

PHCodes commented Oct 5, 2023

It'd be easier to review if this was split into multiple smaller prs, but seeing as I don't want to put more work on you, just adding the comments to base files should be enough for now. Any other issues can be worked on later

I have added many comments to the base files, as requested.

@PHCodes
Copy link
Contributor Author

PHCodes commented Oct 5, 2023

Fixed, but properly this time.

@PHCodes PHCodes requested a review from DebugOk October 6, 2023 01:06
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 6, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 6, 2023
@DebugOk DebugOk dismissed their stale review October 8, 2023 18:06

Fuck it:tm:

@DebugOk
Copy link
Contributor

DebugOk commented Oct 8, 2023

Approval not required
All checks have passed
This branch has no conflicts with the base branch
Merging can be performed automatically.

Whats the worst that could happen

@DebugOk DebugOk merged commit 93c3b03 into DeltaV-Station:master Oct 8, 2023
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Oct 23, 2023
@portfiend portfiend mentioned this pull request Jul 16, 2024
9 tasks
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants