Porting main code changes from Polaris rebase.#5262
Merged
out-of-phaze merged 16 commits intoNebulaSS13:devfrom Feb 6, 2026
Merged
Porting main code changes from Polaris rebase.#5262out-of-phaze merged 16 commits intoNebulaSS13:devfrom
out-of-phaze merged 16 commits intoNebulaSS13:devfrom
Conversation
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
6 times, most recently
from
c11cf42 to
33a14d8
Compare
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
2 times, most recently
from
f4f0e83 to
a9d8e87
Compare
Contributor
Author
|
Pulled in a ton of new commits from the Cynosure branch, they should be fairly self-explanatory. |
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
from
a9d8e87 to
00d84b5
Compare
MistakeNot4892
added
the
has dependencies
Contributor
Author
|
Depends on #5219 |
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
from
00d84b5 to
25006c4
Compare
MistakeNot4892
removed
the
has dependencies
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
2 times, most recently
from
5356eb1 to
f57fb79
Compare
MistakeNot4892
added
do not merge
Merged
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
3 times, most recently
from
7fa3960 to
f0e8e3f
Compare
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
from
f0e8e3f to
a3dbce0
Compare
MistakeNot4892
added
ready for review
Contributor
Author
|
Rebased to remove all the removed commits/logic. |
out-of-phaze
requested changes
Feb 5, 2026
Comment on lines
+10
to
+21
| @@ -18,7 +18,7 @@ | |||
| . = replacetext(., "$USER_THEM$", user_gender.him) | |||
| . = replacetext(., "$USER_THEIR$", user_gender.his) | |||
| . = replacetext(., "$USER_SELF$", user_gender.self) | |||
| . = replacetext(., "$USER$", "<b>\the [user]</b>") | |||
| . = replacetext(., "$USER$", "<b>[user]</b>") | |||
Member
There was a problem hiding this comment.
this change was made for a reason. capitalize_proper_html() is used to fix the capitalization of the start of the emote string. where are you using the replacements that that isn't used?
Contributor
Author
There was a problem hiding this comment.
Cryopods, looks like. Dropping this commit and fixing that.
out-of-phaze
added
awaiting author
MistakeNot4892
force-pushed
the
port/polaris_main_code
branch
from
a3dbce0 to
908de45
Compare
out-of-phaze
approved these changes
Feb 6, 2026
out-of-phaze
added
ready for review
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Keeping main code and Polaris code aligned as much as possible will make future merges less painful. I can split the commit up potentially but a list of changes is below.