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.

Sign up for GitHub

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

[WIP]Aramid armor is like an onion, it has many layers: Kevlar rework, EOD gear and cut-gear. #35522

Closed
wants to merge 10 commits into from
Closed

[WIP]Aramid armor is like an onion, it has many layers: Kevlar rework, EOD gear and cut-gear. #35522

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
61c277a
no kevins were harmed in the production of this kevinlar
tenmillimaster Sep 15, 2019
9a3e7ba
Update head.json
tenmillimaster Nov 14, 2019
7a81d97
toe cap
tenmillimaster Nov 15, 2019
721f12f
Merge branch 'master' into ke(vin)lar-fabric
tenmillimaster Nov 19, 2019
2770252
Merge branch 'master' into ke(vin)lar-fabric
tenmillimaster Nov 28, 2019
dafda96
Update data/json/items/armor.json
tenmillimaster Dec 9, 2019
a49f593
Merge branch 'master' into ke(vin)lar-fabric
tenmillimaster Jan 9, 2020
f79aa66
Update gloves.json
Jan 9, 2020
d5afd8c
Merge branch 'master' into ke(vin)lar-fabric
kevingranade Jan 10, 2020
9b048d2
Update data/json/itemgroups/item_groups.json
tenmillimaster Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/clothing_mods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"type": "clothing_mod",
"id": "kevlar_padded",
"flag": "kevlar_padded",
"item": "kevlar_plate",
"item": "sheet_kevlar_layered",
"implement_prompt": "Pad with Kevlar",
"destroy_prompt": "Destroy Kevlar padding",
"mod_value": [
Expand Down
2 changes: 1 addition & 1 deletion data/json/harvest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "kevlar_plate", "type": "skin", "mass_ratio": 0.015 },
{ "drop": "sheet_kevlar", "type": "skin", "mass_ratio": 0.24 },
{ "drop": "pheromone", "type": "bionic", "max": 1 }
]
},
Expand Down
16 changes: 15 additions & 1 deletion data/json/itemgroups/clothing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@
{ "item": "winter_jacket_army" },
{ "item": "winter_pants_army" },
{ "item": "boots_combat" },
{
"collection": [ { "distribution": [ { "item": "balclava", "prob": 90 }, { "item": "balaclava_cut_resistant", "prob": 10 } ] } ],
"prob": 25
},
{ "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 20 },
{ "collection": [ { "item": "gloves_liner" }, { "item": "winter_gloves_army" } ], "prob": 40 },
{ "item": "elbow_pads", "prob": 10 },
Expand Down Expand Up @@ -316,7 +320,8 @@
"entries": [
{ "item": "gloves_leather", "prob": 30 },
{ "item": "gloves_rubber", "prob": 10 },
{ "item": "gloves_work", "prob": 60 }
{ "item": "gloves_work", "prob": 60 },
{ "item": "gloves_cut_resistant", "prob": 10 }
]
},
{
Expand Down Expand Up @@ -394,6 +399,10 @@
[ "mask_filter", 30 ],
[ "glasses_safety", 30 ],
[ "ear_plugs", 35 ],
[ "apron_cut_resistant", 5 ],
[ "gloves_cut_resistant", 10 ],
[ "chaps_cut_resistant", 5 ],
[ "armguard_cut_resistant", 5 ],
[ "apron_leather", 10 ],
[ "tool_belt", 30 ],
[ "knee_pads", 20 ],
Expand Down Expand Up @@ -1279,6 +1288,11 @@
[ "sneakers", 70 ]
]
},
{
"type": "item_group",
"id": "EOD_armor",
"items": [ [ "armor_EOD_light", 20 ], [ "armor_EOD", 100 ], [ "boots_EOD", 30 ] ]
},
{
"type": "item_group",
"id": "mil_armor",
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/food_service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,8 @@
[ "spork", 5 ],
[ "foon", 5 ],
[ "fruit_wine", 20 ],
[ "gloves_cut_resistant", 5 ],
[ "armguard_cut_resistant", 2 ],
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
[ "wine_riesling", 10 ],
[ "wine_chardonnay", 13 ],
[ "wine_cabernet", 13 ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
[ "helmet_lobster", 5 ],
[ "helmet_riot", 5 ],
[ "holo_sight", 20 ],
[ "balclava", 10 ],
[ "balaclava_cut_resistant", 5 ],
[ "holster", 15 ],
[ "bandolier_shotgun", 15 ],
[ "torso_bandolier_shotgun", 8 ],
Expand Down
20 changes: 12 additions & 8 deletions data/json/itemgroups/item_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@
[ "clock", 10 ],
[ "hat_chef", 2 ],
[ "jacket_chef", 2 ],
[ "gloves_cut_resistant", 1 ],
[ "kernels", 35 ],
[ "pot", 25 ],
[ "sponge", 30 ],
Expand Down Expand Up @@ -2554,7 +2555,7 @@
[ "tinder", 1 ],
[ "rag", 1 ],
[ "hairpin", 1 ],
[ "kevlar_plate", 1 ],
[ "sheet_kevlar_layered", 1 ],
[ "ceramic_armor", 1 ],
[ "leather", 1 ],
[ "software_hacking", 10 ],
Expand Down Expand Up @@ -3611,6 +3612,9 @@
[ "sleeveless_duster", 5 ],
[ "sleeveless_duster_leather", 5 ],
[ "sleeveless_duster_fur", 5 ],
[ "apron_cut_resistant", 2 ],
[ "chaps_cut_resistant", 5 ],
[ "balaclava_cut_resistant", 5 ],
[ "gold_watch", 15 ],
[ "silver_watch", 20 ],
[ "sf_watch", 7 ],
Expand Down Expand Up @@ -5982,7 +5986,7 @@
[ "steel_chunk", 30 ],
[ "spring", 50 ],
[ "steel_lump", 30 ],
[ "kevlar_plate", 10 ],
[ "sheet_kevlar_layered", 10 ],
[ "ceramic_armor", 15 ],
[ "motor", 2 ],
{ "group": "ammo_heavy_batteries_full", "prob": 50 },
Expand Down Expand Up @@ -6010,7 +6014,7 @@
"items": [
[ "baton", 8 ],
[ "tazer", 3 ],
[ "kevlar_plate", 10 ],
[ "sheet_kevlar_layered", 10 ],
[ "ceramic_armor", 15 ],
[ "tonfa", 10 ],
[ "shocktonfa_off", 5 ],
Expand All @@ -6027,7 +6031,7 @@
"id": "tripod",
"items": [
{ "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
[ "kevlar_plate", 10 ],
[ "sheet_kevlar_layered", 10 ],
[ "ceramic_armor", 15 ],
[ "alloy_plate", 10 ],
[ "robot_controls", 3 ]
Expand All @@ -6036,7 +6040,7 @@
{
"type": "item_group",
"id": "chickenbot",
"items": [ [ "9mm", 8 ], [ "kevlar_plate", 10 ], [ "ceramic_armor", 15 ], [ "alloy_plate", 10 ], [ "robot_controls", 5 ] ]
"items": [ [ "9mm", 8 ], [ "rigid_kevlar_plate", 10 ], [ "ceramic_armor", 15 ], [ "alloy_plate", 10 ], [ "robot_controls", 5 ] ]
},
{
"type": "item_group",
Expand All @@ -6046,7 +6050,7 @@
{ "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
[ "556", 8 ],
[ "alloy_plate", 10 ],
[ "kevlar_plate", 10 ],
[ "sheet_kevlar_layered", 10 ],
[ "ceramic_armor", 10 ],
[ "hard_plate", 30 ],
[ "robot_controls", 5 ]
Expand Down Expand Up @@ -6122,7 +6126,7 @@
[ "modularveststeel", 20 ],
[ "modularvestsuper", 8 ],
[ "modularvesthard", 5 ],
[ "kevlar_plate", 10 ],
[ "sheet_kevlar_layered", 10 ],
[ "mask_gas", 10 ],
[ "helmet_army", 40 ],
[ "helmet_liner", 10 ],
Expand Down Expand Up @@ -8617,7 +8621,7 @@
[ "sewing_kit", 1 ],
[ "tailors_kit", 9 ],
[ "knitting_needles", 15 ],
[ "kevlar_plate", 10 ],
[ "sheet_kevlar_layered", 10 ],
[ "leather", 10 ],
[ "rag", 20 ],
[ "needle_curved", 10 ],
Expand Down
4 changes: 4 additions & 0 deletions data/json/itemgroups/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@
{ "group": "ammo_swat", "prob": 20 },
{ "group": "guns_swat", "prob": 20 },
{ "group": "mags_swat", "prob": 20 },
{ "group": "EOD_armor", "prob": 20 },
[ "bfg50", 6 ],
[ "m107a1", 3 ],
[ "as50", 1 ],
[ "l_car_223_kit", 5 ],
[ "l_dsr_223_kit", 5 ],
[ "l_lmg_223_kit", 5 ],
Expand Down
Loading