Armor 2.5#7312
Open
dwasint wants to merge 29 commits into
Open
Conversation
…ayer armor for penetration calcs. bites use edge protection adds it in for clashing aswell forgot bolt, but also changes dart to defines cause I forgot forgot bolts arrow and dart makes special intents respect edge protection adds comments about why I didn't convert the rest of the human defenses into it. Update armor.dm as per the discord thread implements this in an empty state, damage works as before without ep set so this is just a preface for a real pr
…ayer armor for penetration calcs. bites use edge protection adds it in for clashing aswell forgot bolt, but also changes dart to defines cause I forgot forgot bolts arrow and dart makes special intents respect edge protection adds comments about why I didn't convert the rest of the human defenses into it. Update armor.dm as per the discord thread implements this in an empty state, damage works as before without ep set so this is just a preface for a real pr
…ts you layer armor for penetration calcs." This reverts commit 0c2014f.
github-actions
Bot
added
Feature
github-actions
Bot
removed
the
MERGE CONFLICT
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
1 participant
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
This REQUIRES armor 2 to be merged first,
basically the systems requested that were specifically asked of me to be put in armor 2 but not in that.
Why It's Good For The Game
Changelog
🆑
adds: dormant edge protection
adds: dormant layering
/:cl:
Pre-Merge Checklist