-
Notifications
You must be signed in to change notification settings - Fork 200
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
Make Markings Less Hell + Chitinid Hotfix #1661
Merged
VMSolidus
merged 17 commits into
Simple-Station:master
from
sleepyyapril:make-markings-less-hell
Jan 26, 2025
Merged
Make Markings Less Hell + Chitinid Hotfix #1661
VMSolidus
merged 17 commits into
Simple-Station:master
from
sleepyyapril:make-markings-less-hell
Jan 26, 2025
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
* bogos binted * bogos binted * bogos binted * bogos binted * bogos binted * bogos binted * bogos binted * fixes, still doesnt stay completed. * fixed real * meow * meow
github-actions
bot
added
Status: Needs Review
Someone please review this
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: YML
Changes any yml files
labels
Jan 26, 2025
This reverts commit 0f42e3e.
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…ngines into make-markings-less-hell
Signed-off-by: Skubman <[email protected]>
Signed-off-by: sleepyyapril <[email protected]>
Signed-off-by: Skubman <[email protected]>
This reverts commit 542a7be.
…pril/Einstein-Engines into make-markings-less-hell
Signed-off-by: Skubman <[email protected]>
Signed-off-by: Skubman <[email protected]>
Signed-off-by: Skubman <[email protected]>
Signed-off-by: Skubman <[email protected]>
…e) (#2796) * Bug Fix + Resistance updates + Guidebook update Fixes the bug where they lose their light with an anom (Game limitations lets them only have one light at a time but the light returns after losing the anom) Tweaked resistance to be a bit more tanky for the cost of weaker to elemental things like shock and harder to heal due to inability to be injected Removed unneeded text from guidebook entry, added a more visible warning about Chitzite, fixed a spelling error, reflected more of the numerical values in the text. * Chocolate edible
…pril/Einstein-Engines into make-markings-less-hell
sleepyyapril
changed the title
Make Markings Less Hell
Make Markings Less Hell + Chitinid Hotfix
Jan 26, 2025
VMSolidus
approved these changes
Jan 26, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
YE
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: YML
Changes any yml files
Status: Needs Review
Someone please review this
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.
i probably missed a few but someone better than me with markings can fix 'em later