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

Make Markings Less Hell + Chitinid Hotfix #1661

Merged
merged 17 commits into from
Jan 26, 2025

Conversation

sleepyyapril
Copy link
Contributor

i probably missed a few but someone better than me with markings can fix 'em later

Lyndomen and others added 3 commits January 25, 2025 15:48
* 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 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
@SimpleStation14 SimpleStation14 changed the title Make markings less hell Make Markings Less Hell Jan 26, 2025
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 26, 2025
Copy link
Contributor

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

@angelofallars angelofallars self-requested a review January 26, 2025 02:17
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 26, 2025
angelofallars and others added 11 commits January 26, 2025 10:40
Signed-off-by: Skubman <[email protected]>
Signed-off-by: sleepyyapril <[email protected]>
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
@github-actions github-actions bot added the Changes: Documentation Changes any xml or md files label Jan 26, 2025
@sleepyyapril sleepyyapril changed the title Make Markings Less Hell Make Markings Less Hell + Chitinid Hotfix Jan 26, 2025
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

YE

@VMSolidus VMSolidus merged commit 0a2ace1 into Simple-Station:master Jan 26, 2025
11 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants