Upstream Diona #867
Closed
Upstream Diona #867
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
|
Not only is this going to massively conflict, but we set those values to that for a reason. Wait until after the upstream merge to assess this, and don't remove the frontier specific stuff. |
|
Why the closed? This can be left as a draft for after the upstream, so it can be here as a topic point. We have a tag for topics that need assessments. |
|
It's closed because it's going to conflict and also 90% of thar needs to stay |
|
Every line in this pr is either already handled in the merge, or is frontier specific and shouldn't be changed |
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
Putting Diona back to what they were on upstream, no more walking over glass shared, thats part of what diona are.
Why / Balance
Diona back to be diona.
Technical details
Having tags system on any species can get us to have upstream conflicts since the tag system replaced tag, not carry tags over parent to child entity.
Media
N/A
Breaking changes
N/A
Changelog
🆑 dvir01