Skip to content

Commit

Permalink
Removes Chaplain Magic (shiptest-ss13#2936)
Browse files Browse the repository at this point in the history
<!-- 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. -->
  • Loading branch information
FalloutFalcon authored and MrCat15352 committed Jun 22, 2024
1 parent f71bcba commit 338e9be
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
pixel_x = -5;
pixel_y = 12
},
/obj/item/clothing/head/helmet/chaplain/ancient{
/obj/item/clothing/head/witchunter{
pixel_y = 13;
pixel_x = -5
},
Expand Down
2 changes: 1 addition & 1 deletion check_regex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ standards:

- exactly:
[
268,
265,
"non-bitwise << uses",
'(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
]
Expand Down

0 comments on commit 338e9be

Please sign in to comment.