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

Rework kevlar, add slash resistant and EOD gear #39964

Merged
merged 6 commits into from
May 19, 2020

Conversation

ymber
Copy link
Member

@ymber ymber commented Apr 27, 2020

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.

@ymber 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
ymber added 2 commits May 4, 2020 11:31
Add fire resistance to tactical gloves. Change helmet materials to
kevlar_rigid.
@ymber ymber force-pushed the split_kevlar_rebase branch from 549eba9 to 102ebd4 Compare May 4, 2020 10:31
@ymber ymber force-pushed the split_kevlar_rebase branch from e37026c to 0add715 Compare May 6, 2020 10:42
@ymber ymber force-pushed the split_kevlar_rebase branch from aea8b01 to e77619f Compare May 11, 2020 08:59
@ymber ymber force-pushed the split_kevlar_rebase branch from 2982522 to 3aefc02 Compare May 13, 2020 06:58
@ymber ymber force-pushed the split_kevlar_rebase branch from 3aefc02 to 65f94c9 Compare May 17, 2020 15:18
@ZhilkinSerg ZhilkinSerg merged commit f8f9f52 into CleverRaven:master May 19, 2020
@ymber ymber deleted the split_kevlar_rebase branch May 19, 2020 08:30
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants