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

Removes Chaplain Magic #2936

Merged
merged 15 commits into from
Jun 12, 2024
Merged

Removes Chaplain Magic #2936

merged 15 commits into from
Jun 12, 2024

Conversation

FalloutFalcon
Copy link
Member

About The Pull Request

Removes a lot of magic effects the chaplain like purifying cult runes and healing people by smacking them on the head and immunity to cult conversion
Makes the only chaplain amour witchhunter because templars are generic (I know witchhunters are still pretty generic but it fits more with the srm)

Why It's Good For The Game

We don't plan on ever using any of this content.
Makes room for less cruft based chaplain content

Changelog

🆑
del: Removed alot of chaplain stuff we will never use
del: The chaplain is now just as magic as the average person
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Apr 25, 2024
@Sun-Soaked
Copy link
Member

God stealth removal, in line with design goals

@FalloutFalcon
Copy link
Member Author

god was magic

@FalloutFalcon FalloutFalcon marked this pull request as ready for review April 29, 2024 13:27
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner April 29, 2024 13:27
@rye-rice rye-rice added this pull request to the merge queue May 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 20, 2024
@rye-rice rye-rice added this pull request to the merge queue May 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 20, 2024
@FalloutFalcon FalloutFalcon added the Removal We hate fun. label May 24, 2024
Copy link
Contributor

github-actions bot commented Jun 2, 2024

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner June 2, 2024 21:44
@github-actions github-actions bot added the Sprites A bikeshed full of soulless bikes. label Jun 2, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 9, 2024
Copy link
Contributor

github-actions bot commented Jun 9, 2024

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 9, 2024
@Imaginos16
Copy link
Member

LGTM

@Imaginos16 Imaginos16 added this pull request to the merge queue Jun 12, 2024
Merged via the queue into shiptest-ss13:master with commit 63fc26e Jun 12, 2024
14 checks passed
@FalloutFalcon FalloutFalcon deleted the bible branch June 18, 2024 23:36
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Removes a lot of magic effects the chaplain like purifying cult runes
and healing people by smacking them on the head and immunity to cult
conversion
Makes the only chaplain amour witchhunter because templars are generic
(I know witchhunters are still pretty generic but it fits more with the
srm)
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

We don't plan on ever using any of this content.
Makes room for less cruft based chaplain content

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
del: Removed alot of chaplain stuff we will never use
del: The chaplain is now just as magic as the average person
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Removal We hate fun. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants