Aberrant#207
Draft
Lyroth001 wants to merge 40 commits into
Draft
Conversation
…-Port-14 into aberrantDamage "fix merge conflicts"
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Owner
|
Aberrant damage just a week away... |
Contributor
Collaborator
|
You may have to remake this with a new 'master' based branch and move your changes over, as the submodule error isn't going away. Cool though! |
Collaborator
Author
|
oh thats what that error is |
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
3 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.
About the PR
Design doc linked here
Current implementation will use the bible, holy water and ethanol, as well as mindbreaker (at significant damage to patient) to treat Aberrant.
Full implementation requires Upstream chat refactor space-wizards/space-station-14#33858 for psychologist and chaplain.
Additionally cool hallucinations (things that arent there) are outside the scope of this PR, for now it's limited to the flavor text popup
Why / Balance
See design doc
cool eldritch horror shit
Technical details
TBA when ive changed the code
Media
Breaking changes
TBA when ive changed the code - trying to keep everything in its own files soooo
No idea if changelog works but
Changelog