-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Rework kevlar, add slash resistant and EOD gear #39964
Merged
Merged
Conversation
This file contains 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
ymber
added
<Enhancement / Feature>
New features, or enhancements on existing
[JSON]
Changes (can be) made in JSON
Crafting / Construction / Recipes
Includes: Uncrafting / Disassembling
Items / Item Actions / Item Qualities
Items and how they work and interact
labels
Apr 27, 2020
ghost
suggested changes
Apr 27, 2020
ymber
force-pushed
the
split_kevlar_rebase
branch
from
April 28, 2020 10:25
2f1e91b
to
f24ae53
Compare
This was referenced May 3, 2020
Add fire resistance to tactical gloves. Change helmet materials to kevlar_rigid.
kevingranade
reviewed
May 4, 2020
Amoebka
reviewed
May 5, 2020
This was referenced May 10, 2020
ZhilkinSerg
reviewed
May 11, 2020
ymber
force-pushed
the
split_kevlar_rebase
branch
from
May 11, 2020 08:59
aea8b01
to
e77619f
Compare
ZhilkinSerg
reviewed
May 12, 2020
ymber
force-pushed
the
split_kevlar_rebase
branch
from
May 13, 2020 06:58
2982522
to
3aefc02
Compare
ZhilkinSerg
reviewed
May 17, 2020
ymber
force-pushed
the
split_kevlar_rebase
branch
from
May 17, 2020 15:18
3aefc02
to
65f94c9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Crafting / Construction / Recipes
Includes: Uncrafting / Disassembling
<Enhancement / Feature>
New features, or enhancements on existing
Items / Item Actions / Item Qualities
Items and how they work and interact
[JSON]
Changes (can be) made in JSON
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.
Summary
SUMMARY: Content "Rework aramid materials, add slash resistant and EOD gear"
Purpose of change
Our current kevlar materials don't behave like kevlar.
Describe the solution
Adds new materials for different types of aramid fabric and armor panels and adds some new slash resistant gear and EOD gear using them.
Testing
Game loads. New items don't crash my debug menu. Values for stuff look about right.
Additional context
This is just #35522 rebased onto current master.