Psionic Import Draft #481
Closed
Psionic Import Draft #481
Conversation
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
github-actions
bot
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Content.Client/UserInterface/Systems/Chat/ChatUIController.cs # Content.Server/Content.Server.csproj # Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs # Content.Server/Visible/VisibilityFlags.cs
|
this has a lot of extra psionics stuff in it. I havent actually been able to do a deep dive review, but I did keep it updated and resolved conflicts. My goal is to get skrell in before december. |
github-actions
bot
removed
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
Merge Conflict
github-actions
bot
added
Merge Conflict
This was referenced Feb 21, 2024
|
Moved to #1042 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
I did this a while ago to try to bring some basic psionics to Frontier from Nyano code. The major goal being telepathy. This is about 1700+ commits behind current so it may very well have a lot of merge conflicts. I'm also not done with this since it's missing quite a couple icons and whatnot.
Changelog
🆑