Toggle Melee Blocking#12667
Open
realforest2001 wants to merge 1 commit into
Open
Conversation
cmss13-ci
Bot
added
Feature
Contributor
Test merge deployment history:Test Merge Deployed @ 07/17/2026 00:08:37 +00:00:Server InstanceRevisionTest Merge Updated @ 07/17/2026 06:57:53 +00:00:Server InstanceCM13 Live RevisionOrigin: 2edb173 Test Merge Updated @ 07/17/2026 20:27:33 +00:00:Server InstanceRevisionTest Merge Updated @ 07/18/2026 03:05:33 +00:00:Server InstanceCM13 Live RevisionOrigin: 8f06b5c Test Merge Updated @ 07/18/2026 04:04:01 +00:00:Server InstanceRevisionTest Merge Updated @ 07/18/2026 09:08:09 +00:00:Server InstanceRevisionTest Merge Updated @ 07/18/2026 13:26:08 +00:00:Server InstanceRevisionTest Merge Updated @ 07/18/2026 14:11:21 +00:00:Server InstanceRevisionTest Merge Updated @ 07/18/2026 15:18:50 +00:00:Server InstanceRevisionTest Merge Updated @ 07/18/2026 16:11:05 +00:00:Server InstanceRevisionTest Merge Updated @ 07/19/2026 05:15:51 +00:00:Server InstanceCM13 Live RevisionOrigin: 236040e Test Merge Updated @ 07/19/2026 08:17:36 +00:00:Server InstanceCM13 Live RevisionOrigin: 36e499a Test Merge Updated @ 07/19/2026 13:44:35 +00:00:Server InstanceRevisionTest Merge Updated @ 07/19/2026 15:20:22 +00:00:Server InstanceRevision |
fira
requested changes
Jul 17, 2026
Comment on lines
+111
to
+114
| if(HAS_TRAIT(src, TRAIT_LOWERED_GUARD)) | ||
| . += "Melee Guard: Lowered, not blocking." | ||
| else | ||
| . += "Melee Guard: Raised, blocking when able." |
Member
There was a problem hiding this comment.
That should only show if you have a compatible weapon, otherwise it clutters objectives display
github-project-automation
Bot
moved this from Awaiting Review
to Changes Requested
in Review Backlog
3 tasks
Contributor
|
the current status and text box message do not correlate properly with one another, I.E one says youre blocking while the other doesnt |
This was referenced Jul 18, 2026
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
4 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 pull request
Allows human mobs to toggle if they want to block with their melee weapons or not. This does not apply to physical shields like the riot shield.
Raised guard will run the percentage checks to block/check if directions are correct.
Lowered guard will only check if a physical shield is being used to block and then continue.
Neither setting will affect armor blocking pounces nor shields on their back.
Melee Guard status will display in the status tab for easy reference.
Explain why it's good for the game
People want the flexibility to not always block, particularly some pred players. This allows the system to remain functional for circumstances where it is desired, whilst also allowing the freedom to choose.
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
add: Added the ability to choose not attempt blocks with melee weapons. Keybind and IC tab verb available for toggle.
/:cl: