diff --git a/data/json/clothing_mods.json b/data/json/clothing_mods.json index 804e158988c71..116e9cded3932 100644 --- a/data/json/clothing_mods.json +++ b/data/json/clothing_mods.json @@ -30,7 +30,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": [ diff --git a/data/json/harvest.json b/data/json/harvest.json index 9d955e91b5e86..3581be37e8004 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -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 } ] }, diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index d57b4a366b090..b4d388e98c060 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -161,6 +161,12 @@ { "group": "clothing_military_winter" }, { "item": "elbow_pads", "prob": 10 }, { "item": "knee_pads", "prob": 85 }, + { "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ] }, + { "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": 80 }, { "collection": [ { "item": "gloves_liner", "prob": 60 }, { "item": "winter_gloves_army" } ], "prob": 80 }, { "item": "ballistic_vest_esapi", "prob": 90 }, @@ -357,7 +363,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 } ] }, { @@ -435,6 +442,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 ], @@ -1803,6 +1814,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", diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json index 76e2952322c37..930a257ddbe7f 100644 --- a/data/json/itemgroups/food_service.json +++ b/data/json/itemgroups/food_service.json @@ -811,6 +811,8 @@ [ "foon", 5 ], { "group": "wines_worthy", "prob": 66 }, [ "fruit_wine", 20 ], + [ "gloves_cut_resistant", 5 ], + [ "armguard_cut_resistant", 2 ], [ "hat_chef", 30 ], [ "jacket_chef", 30 ], [ "pants_checkered", 28 ] diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json index 202b55dcc6f31..f494ba1ab3619 100644 --- a/data/json/itemgroups/gear.json +++ b/data/json/itemgroups/gear.json @@ -72,6 +72,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 ], diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index bb839f90f96c2..29b2ae5a22ac4 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -288,6 +288,7 @@ [ "clock", 10 ], [ "hat_chef", 2 ], [ "jacket_chef", 2 ], + [ "gloves_cut_resistant", 1 ], [ "pot", 25 ], [ "sponge", 30 ], [ "pot_copper", 15 ], @@ -1614,7 +1615,7 @@ [ "tinder", 1 ], [ "rag", 1 ], [ "hairpin", 1 ], - [ "kevlar_plate", 1 ], + [ "sheet_kevlar_layered", 1 ], [ "ceramic_armor", 1 ], [ "leather", 1 ], [ "software_hacking", 10 ], @@ -2491,7 +2492,7 @@ [ "modularveststeel", 20 ], [ "modularvestsuper", 8 ], [ "modularvesthard", 5 ], - [ "kevlar_plate", 10 ], + [ "sheet_kevlar_layered", 10 ], [ "mask_gas", 10 ], [ "helmet_army", 40 ], [ "helmet_liner", 10 ], @@ -3672,7 +3673,7 @@ [ "sewing_kit", 1 ], [ "tailors_kit", 9 ], [ "knitting_needles", 15 ], - [ "kevlar_plate", 10 ], + [ "sheet_kevlar_layered", 10 ], [ "leather", 10 ], [ "rag", 20 ], [ "needle_curved", 10 ], diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index 4e17ad87706a2..9f5f2bd838ebb 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -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 ], diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 3600d44c8f6df..b89170c7d8b23 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -75,7 +75,7 @@ "weight": "7200 g", "volume": "9 L", "price": 140000, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "symbol": "[", "looks_like": "hazmat_suit", "color": "light_red", @@ -109,6 +109,15 @@ "environmental_protection": 1, "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ] }, + { + "id": "apron_cut_resistant", + "type": "ARMOR", + "name": "cut-resistant apron", + "description": "An apron made of kevlar fabric which provides excellent protection from cuts.", + "copy-from": "apron_leather", + "price": 3800, + "material": [ "kevlar" ] + }, { "id": "apron_leather", "type": "ARMOR", @@ -206,6 +215,17 @@ "environmental_protection": 2, "flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY" ] }, + { + "id": "armguard_cut_resistant", + "type": "ARMOR", + "name": "pair of cut-resistant arm sleeves", + "name_plural": "pairs of cut-resistant arm sleeves", + "description": "A long pair of cut resistant sleeves, with thumbholes. Useful for chainsaw protection.", + "weight": "113 g", + "copy-from": "armguard_soft", + "price": 1200, + "material": [ "kevlar" ] + }, { "id": "armguard_acidchitin", "copy-from": "armguard_chitin", @@ -434,6 +454,29 @@ "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 }, "relative": { "bashing": 1, "material_thickness": 1, "environmental_protection": 2 } }, + { + "id": "armor_EOD_light", + "type": "ARMOR", + "name": "tactical EOD suit", + "description": "This is a bulky kevlar suit for explosive ordnance disposal in hostile environments. Lighter than a normal EOD suit, it compromises between protection and maneuverability, though it will still provide some protection from overpressure, fragmentation, impact and heat.", + "looks_like": "kevlar", + "weight": "17273 g", + "volume": "7000 ml", + "price": 700000, + "to_hit": -6, + "bashing": 7, + "encumbrance": 70, + "material": [ "kevlar_layered", "nomex" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "TORSO", "ARMS", "LEGS" ], + "coverage": 100, + "warmth": 55, + "material_thickness": 6, + "environmental_protection": 2, + "storage": "250 ml", + "flags": [ "STURDY", "OUTER", "RAINPROOF", "ONLY_ONE" ] + }, { "id": "armor_farmor", "type": "ARMOR", @@ -691,7 +734,7 @@ "volume": "7500 ml", "price": 180000, "to_hit": -3, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "armor_nomad", "color": "green", @@ -811,6 +854,15 @@ "material_thickness": 2, "flags": [ "VARSIZE", "SKINTIGHT" ] }, + { + "id": "balaclava_cut_resistant", + "type": "ARMOR", + "name": "cut-resistant balaclava", + "description": "A face covering garment that helps protect from slashes and cuts, in addition to the cold.", + "copy-from": "balclava", + "price": 7600, + "material": [ "kevlar" ] + }, { "id": "baldric", "type": "ARMOR", @@ -1711,6 +1763,18 @@ "material_thickness": 4, "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "ELECTRIC_IMMUNE", "OUTER" ] }, + { + "id": "chaps_cut_resistant", + "type": "ARMOR", + "name": "chainsaw chaps", + "name_plural": "chainsaw chaps", + "description": "A pair of tough chaps made of kevlar. Chainsaw kickbacks are potentially fatal; personal protective equipment like these chaps help protect your femoral arteries. The layered kevlar is designed to fray on contact with the chain and bind up the tool.", + "weight": "1519 g", + "copy-from": "chaps_leather", + "price": 7800, + "material": [ "kevlar_layered" ], + "material_thickness": 2 + }, { "id": "chaps_leather", "type": "ARMOR", @@ -2352,7 +2416,7 @@ "price": 190000, "to_hit": -3, "bashing": 6, - "material": [ "lightceramic", "kevlar" ], + "material": [ "lightceramic", "kevlar_layered" ], "symbol": "[", "looks_like": "kevlar", "color": "light_red", @@ -2375,7 +2439,7 @@ "price": 1900, "to_hit": -3, "bashing": 6, - "material": [ "kevlar" ], + "material": [ "kevlar_layered" ], "symbol": "[", "looks_like": "dragonskin", "color": "light_red", @@ -2478,7 +2542,7 @@ "price": 4500, "to_hit": 2, "bashing": 1, - "material": [ "kevlar", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "holster", "color": "dark_gray", @@ -2579,7 +2643,7 @@ "volume": "9500 ml", "price": 40000, "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "cotton", "kevlar_layered" ], "symbol": "[", "looks_like": "duster_leather", "color": "brown", @@ -2809,7 +2873,7 @@ "weight": "450 g", "volume": "2 L", "price": 2500, - "material": [ "cotton", "kevlar" ], + "material": [ "cotton", "nylon" ], "symbol": "[", "looks_like": "pants", "color": "white", @@ -3006,7 +3070,7 @@ "price": 200000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "nomex" ], + "material": [ "kevlar_layered", "nomex" ], "symbol": "[", "looks_like": "survivor_suit", "color": "light_gray", @@ -3073,7 +3137,7 @@ "volume": "250 ml", "price": 7500, "to_hit": -2, - "material": [ "kevlar_rigid", "plastic" ], + "material": [ "plastic", "nylon" ], "symbol": "[", "looks_like": "glasses_safety", "color": "dark_gray", @@ -3212,6 +3276,589 @@ "environmental_protection": 1, "flags": [ "WATER_FRIENDLY", "OUTER" ] }, + { + "id": "glove_jackson", + "type": "ARMOR", + "name": "white glove", + "name_plural": "white gloves", + "description": "A single white glove covered with hundreds of rhinestones.", + "weight": "59 g", + "volume": "250 ml", + "price": 50000, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "white", + "covers": [ "HAND_R" ], + "coverage": 95, + "warmth": 20, + "material_thickness": 2, + "flags": [ "WATER_FRIENDLY", "FANCY" ] + }, + { + "id": "gloves_bag", + "type": "ARMOR", + "name": "pair of bag gloves", + "name_plural": "pairs of bag gloves", + "description": "A pair of disposable plastic bags, adapted to be used as gloves.", + "weight": "6 g", + "volume": "250 ml", + "price": 50, + "to_hit": -1, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "light_blue", + "covers": [ "HANDS" ], + "coverage": 70, + "encumbrance": 7, + "material_thickness": 1, + "flags": [ "WATERPROOF", "OVERSIZE", "OUTER" ] + }, + { + "id": "gloves_fingerless", + "type": "ARMOR", + "name": "pair of fingerless gloves", + "name_plural": "pairs of fingerless gloves", + "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.", + "weight": "100 g", + "volume": "250 ml", + "price": 1400, + "to_hit": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 50, + "warmth": 10, + "material_thickness": 1, + "flags": [ "VARSIZE", "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_fingerless_mod", + "type": "ARMOR", + "category": "armor", + "name": "pair of armored fingerless gloves", + "name_plural": "pairs of armored fingerless gloves", + "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity. These have been crudely reinforced with steel guards across the back.", + "weight": "380 g", + "volume": "500 ml", + "price": 9000, + "to_hit": 2, + "material": [ "steel", "leather" ], + "symbol": "[", + "looks_like": "gloves_fingerless", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 3, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_fsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of survivor firegloves", + "name_plural": "pairs of survivor firegloves", + "description": "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "410 g", + "volume": "1 L", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar_layered", "nomex" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 30, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 10, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_fur", + "type": "ARMOR", + "name": "pair of fur gloves", + "name_plural": "pairs of fur gloves", + "description": "A pair of warm fur gloves. They are somewhat cumbersome.", + "weight": "410 g", + "volume": "1 L", + "price": 4000, + "to_hit": 1, + "material": [ "fur" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 30, + "warmth": 70, + "material_thickness": 3 + }, + { + "id": "gloves_hsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of heavy survivor gloves", + "name_plural": "pairs of heavy survivor gloves", + "description": "A pair of heavily customized, steel-backed armored Kevlar gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "380 g", + "volume": "1 L", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar_layered", "steel" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 30, + "warmth": 15, + "material_thickness": 4, + "environmental_protection": 5, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_leather", + "type": "ARMOR", + "name": "pair of leather gloves", + "name_plural": "pairs of leather gloves", + "description": "A thin pair of black leather gloves.", + "weight": "160 g", + "volume": "250 ml", + "price": 4500, + "to_hit": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 10, + "warmth": 25, + "material_thickness": 1, + "valid_mods": [ "steel_padded" ], + "flags": [ "VARSIZE", "WATERPROOF" ] + }, + { + "id": "gloves_light", + "type": "ARMOR", + "name": "pair of light gloves", + "name_plural": "pairs of light gloves", + "description": "A pair of cotton gloves.", + "weight": "118 g", + "volume": "250 ml", + "price": 1100, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "light_blue", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 2, + "warmth": 20, + "material_thickness": 2, + "flags": [ "WATER_FRIENDLY" ] + }, + { + "id": "gloves_liner", + "type": "ARMOR", + "name": "pair of glove liners", + "name_plural": "pairs of glove liners", + "description": "A pair of thin cotton gloves. Often used as a liner beneath other gloves.", + "weight": "63 g", + "volume": "250 ml", + "price": 600, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 1, + "warmth": 15, + "material_thickness": 1, + "flags": [ "WATER_FRIENDLY", "SKINTIGHT" ] + }, + { + "id": "gloves_lsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of light survivor gloves", + "name_plural": "pairs of light survivor gloves", + "description": "A pair of customized, Kevlar armored cloth gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "190 g", + "volume": "750 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar_layered", "cotton" ], + "symbol": "[", + "looks_like": "gloves_survivor", + "color": "green", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 10, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 3, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_survivor_fingerless", + "type": "ARMOR", + "looks_like": "gloves_lsurvivor", + "category": "armor", + "name": "pair of fingerless survivor gloves", + "name_plural": "pairs of fingerless survivor gloves", + "description": "A pair of customized, Kevlar armored cloth gloves with no fingers, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "160 g", + "volume": "700 ml", + "price": 16000, + "to_hit": 2, + "material": [ "kevlar_layered", "cotton" ], + "symbol": "[", + "color": "green", + "covers": [ "HANDS" ], + "coverage": 85, + "encumbrance": 8, + "warmth": 12, + "material_thickness": 3, + "environmental_protection": 3, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_medical", + "type": "ARMOR", + "name": "pair of medical gloves", + "name_plural": "pairs of medical gloves", + "description": "A pair of thin latex gloves, designed to limit the spread of disease.", + "weight": "10 g", + "volume": 0, + "price": 1000, + "to_hit": 1, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 90, + "encumbrance": 1, + "material_thickness": 1, + "environmental_protection": 6, + "flags": [ "WATER_FRIENDLY", "WATERPROOF", "SKINTIGHT" ] + }, + { + "id": "gloves_plate", + "type": "ARMOR", + "category": "armor", + "name": "pair of armored gauntlets", + "name_plural": "pairs of armored gauntlets", + "description": "An extremely heavy set of armor-plated leather gloves.", + "weight": "980 g", + "volume": "1500 ml", + "price": 40000, + "to_hit": -2, + "bashing": 7, + "material": [ "iron", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 20, + "warmth": 20, + "material_thickness": 4, + "environmental_protection": 1, + "flags": [ "VARSIZE", "STURDY" ] + }, + { + "id": "gloves_rubber", + "type": "ARMOR", + "name": "pair of rubber gloves", + "name_plural": "pairs of rubber gloves", + "description": "A pair of rubber gloves, often used while cleaning with caustic materials.", + "weight": "20 g", + "volume": "1 L", + "price": 1300, + "to_hit": 2, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "yellow", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 40, + "warmth": 10, + "material_thickness": 3, + "environmental_protection": 8, + "flags": [ "WATERPROOF" ] + }, + { + "id": "gloves_survivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of survivor gloves", + "name_plural": "pairs of survivor gloves", + "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "230 g", + "volume": "750 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar_layered", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 20, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 3, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_tactical", + "type": "ARMOR", + "category": "armor", + "name": "pair of tactical gloves", + "name_plural": "pairs of tactical gloves", + "description": "A pair of flame and cut resistant aramid fabric gloves, with long wrists and leather padding. Commonly used by police and military units.", + "weight": "220 g", + "volume": "500 ml", + "price": 5200, + "to_hit": 2, + "material": [ "kevlar", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 13, + "warmth": 20, + "material_thickness": 2, + "flags": [ "VARSIZE", "STURDY" ] + }, + { + "id": "gloves_winter", + "type": "ARMOR", + "name": "pair of winter gloves", + "name_plural": "pairs of winter gloves", + "description": "A pair of padded gloves. Cumbersome, but warm.", + "weight": "218 g", + "volume": "750 ml", + "price": 6500, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "light_blue", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 40, + "warmth": 70, + "material_thickness": 4 + }, + { + "id": "gloves_wool", + "type": "ARMOR", + "name": "pair of wool gloves", + "name_plural": "pairs of wool gloves", + "description": "A thick pair of wool gloves. Cumbersome, but warm.", + "weight": "240 g", + "volume": "250 ml", + "price": 3500, + "to_hit": 1, + "material": [ "wool" ], + "symbol": "[", + "looks_like": "gloves_winter", + "color": "blue", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 20, + "warmth": 60, + "material_thickness": 3 + }, + { + "id": "gloves_work", + "type": "ARMOR", + "name": "pair of work gloves", + "name_plural": "pairs of work gloves", + "description": "A tough pair of gloves, for tough everyday work.", + "weight": "195 g", + "volume": "250 ml", + "price": 4500, + "to_hit": 2, + "material": [ "leather", "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 20, + "warmth": 25, + "material_thickness": 3, + "environmental_protection": 5, + "flags": [ "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_cut_resistant", + "type": "ARMOR", + "name": "pair of cut resistant gloves", + "name_plural": "pairs of cut resistant gloves", + "description": "A pair of cut resistant gloves, useful for butchery or routine work with bladed objects.", + "weight": "240 g", + "volume": "250 ml", + "price": 9000, + "to_hit": 2, + "material": [ "kevlar" ], + "symbol": "[", + "looks_like": "gloves_work", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 40, + "warmth": 10, + "material_thickness": 4, + "environmental_protection": 1, + "flags": [ "STURDY" ] + }, + { + "id": "gloves_wraps", + "type": "ARMOR", + "name": "pair of hand wraps", + "name_plural": "pairs of hand wraps", + "description": "Long pieces of cloth that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "100 g", + "volume": "250 ml", + "price": 500, + "to_hit": 2, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 50, + "warmth": 5, + "material_thickness": 1, + "flags": [ "SKINTIGHT", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wraps_fur", + "type": "ARMOR", + "name": "pair of fur hand wraps", + "name_plural": "pairs of fur hand wraps", + "description": "Pieces of animal pelt that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "250 g", + "volume": "500 ml", + "price": 700, + "to_hit": 2, + "material": [ "fur" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 5, + "warmth": 20, + "material_thickness": 1, + "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wraps_leather", + "type": "ARMOR", + "name": "pair of leather hand wraps", + "name_plural": "pairs of leather hand wraps", + "description": "Pieces of leather that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "200 g", + "volume": "500 ml", + "price": 525, + "to_hit": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 5, + "warmth": 10, + "material_thickness": 1, + "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wraps_wool", + "type": "ARMOR", + "name": "pair of wool hand wraps", + "name_plural": "pairs of wool hand wraps", + "description": "Long pieces of wool that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "100 g", + "volume": "250 ml", + "price": 500, + "to_hit": 2, + "material": [ "wool" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "blue", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 2, + "warmth": 15, + "material_thickness": 1, + "flags": [ "SKINTIGHT", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of winter survivor gloves", + "name_plural": "pairs of winter survivor gloves", + "description": "A pair of customized, Kevlar armored fur gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "300 g", + "volume": "1250 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar_layered", "fur" ], + "symbol": "[", + "looks_like": "gloves_winter", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 37, + "warmth": 75, + "material_thickness": 4, + "environmental_protection": 5, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_xlsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of XL survivor gloves", + "name_plural": "pairs of XL survivor gloves", + "description": "A massive pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "480 g", + "volume": "1500 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar_layered", "leather" ], + "symbol": "[", + "looks_like": "gloves_survivor", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 30, + "warmth": 15, + "material_thickness": 2, + "environmental_protection": 3, + "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ] + }, { "id": "gobag", "type": "ARMOR", @@ -3666,7 +4313,7 @@ "price": 15000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "symbol": "[", "looks_like": "hat_hard", "color": "green", @@ -3854,7 +4501,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "steel" ], + "material": [ "kevlar_layered", "steel" ], "symbol": "[", "looks_like": "helmet_survivor", "color": "dark_gray", @@ -3943,7 +4590,7 @@ "price": 28000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "symbol": "[", "looks_like": "helmet_barbute", "color": "light_gray", @@ -4053,7 +4700,7 @@ "volume": "2500 ml", "price": 55000, "to_hit": -3, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "mask_gas", "color": "white", @@ -4120,7 +4767,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "helmet_army", "color": "dark_gray", @@ -4144,7 +4791,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "helmet_survivor", "color": "dark_gray", @@ -4208,7 +4855,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "nomex" ], + "material": [ "kevlar_layered", "nomex" ], "symbol": "[", "looks_like": "hood_survivor", "color": "light_gray", @@ -4231,7 +4878,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "hood_survivor", "color": "green", @@ -4273,7 +4920,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "hood_rain", "color": "brown", @@ -4297,7 +4944,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "fur" ], + "material": [ "kevlar_layered", "fur" ], "symbol": "[", "looks_like": "hood_survivor", "color": "light_gray", @@ -4320,7 +4967,7 @@ "price": 58000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "hood_survivor", "color": "brown", @@ -4442,7 +5089,7 @@ "price": 200000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "steel", "leather" ], + "material": [ "kevlar_layered", "steel", "leather" ], "symbol": "[", "looks_like": "survivor_suit", "color": "dark_gray", @@ -5059,7 +5706,7 @@ "price": 80000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar" ], + "material": [ "kevlar_layered" ], "symbol": "[", "looks_like": "vest_leather", "color": "light_gray", @@ -5819,7 +6466,7 @@ "weight": "3000 g", "volume": "6 L", "price": 60000, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "survivor_armor", "color": "green", @@ -5842,7 +6489,7 @@ "weight": "920 g", "volume": "3500 ml", "price": 40000, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "survivor_pants", "color": "green", @@ -5864,7 +6511,7 @@ "weight": "5100 g", "volume": "10500 ml", "price": 110000, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "survivor_suit", "color": "green", @@ -6398,7 +7045,7 @@ "weight": "2100 g", "volume": "3 L", "price": 38000, - "material": [ "cotton", "kevlar" ], + "material": [ "cotton", "kevlar_layered" ], "symbol": "[", "looks_like": "pants_army", "color": "green", @@ -7223,7 +7870,7 @@ "volume": "8 L", "price": 34000, "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "cotton", "kevlar_layered" ], "symbol": "[", "looks_like": "duster_survivor", "color": "brown", @@ -7330,7 +7977,7 @@ "volume": "6 L", "price": 34000, "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "cotton", "kevlar_layered" ], "symbol": "[", "looks_like": "sleeveless_duster_survivor", "color": "brown", @@ -7662,7 +8309,7 @@ "volume": "250 ml", "price": 7500, "to_hit": -2, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "glasses_bal", "color": "dark_gray", @@ -7684,7 +8331,7 @@ "weight": "6800 g", "volume": "11500 ml", "price": 150000, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "touring_suit", "color": "brown", @@ -7730,7 +8377,7 @@ "price": 285000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "touring_suit", "color": "dark_gray", @@ -7795,7 +8442,7 @@ "price": 50000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "symbol": "[", "looks_like": "helmet_motor", "color": "dark_gray", @@ -7819,7 +8466,7 @@ "price": 37000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "symbol": "[", "looks_like": "tac_fullhelmet", "color": "dark_gray", @@ -8161,7 +8808,7 @@ "volume": "7 L", "price": 40000, "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "cotton", "kevlar_layered" ], "symbol": "[", "looks_like": "trenchcoat", "color": "brown", @@ -8703,7 +9350,7 @@ "price": 200000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "fur" ], + "material": [ "kevlar_layered", "fur" ], "symbol": "[", "looks_like": "survivor_suit", "color": "light_gray", @@ -8728,7 +9375,7 @@ "price": 150000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "survivor_suit", "color": "brown", @@ -8753,7 +9400,7 @@ "price": 200000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "steel", "leather" ], + "material": [ "kevlar_layered", "steel", "leather" ], "symbol": "[", "looks_like": "hsurvivor_suit", "color": "dark_gray", @@ -8834,7 +9481,7 @@ "weight": "8700 g", "volume": "20 L", "price": 400000, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "symbol": "[", "looks_like": "hazmat_suit", "color": "light_red", @@ -8875,7 +9522,7 @@ "weight": "2900 g", "volume": "6 L", "price": 240500, - "material": [ "nomex", "kevlar" ], + "material": [ "nomex", "kevlar_layered" ], "symbol": "[", "looks_like": "jumpsuit", "color": "light_gray", diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index f2f81f5026b52..0c3a8cd24b3c2 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -184,7 +184,7 @@ "price_postapoc": 100000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar" ], + "material": [ "kevlar_layered" ], "symbol": "[", "looks_like": "modularvestkevlar", "color": "light_gray", @@ -219,7 +219,7 @@ "price_postapoc": 120000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "ceramic" ], + "material": [ "kevlar_layered", "ceramic" ], "symbol": "[", "looks_like": "modularvestkevlar", "color": "light_gray", @@ -254,7 +254,7 @@ "price_postapoc": 120000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "hardsteel" ], + "material": [ "kevlar_layered", "hardsteel" ], "symbol": "[", "looks_like": "modularvestkevlar", "color": "light_cyan", @@ -289,7 +289,7 @@ "price_postapoc": 120000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "kevlar_rigid" ], + "material": [ "kevlar_layered", "kevlar_rigid" ], "symbol": "[", "looks_like": "vest", "color": "light_gray", @@ -324,7 +324,7 @@ "price_postapoc": 120000, "to_hit": -3, "bashing": 8, - "material": [ "kevlar", "steel" ], + "material": [ "kevlar_layered", "steel" ], "symbol": "[", "looks_like": "modularvestkevlar", "color": "light_cyan", @@ -359,7 +359,7 @@ "price_postapoc": 180000, "to_hit": -3, "bashing": 8, - "material": [ "kevlar", "superalloy" ], + "material": [ "kevlar_layered", "superalloy" ], "symbol": "[", "looks_like": "modularvestkevlar", "color": "light_cyan", @@ -394,7 +394,7 @@ "price_postapoc": 200000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar" ], + "material": [ "kevlar_layered" ], "symbol": "[", "color": "light_gray", "covers": [ "TORSO" ], diff --git a/data/json/items/armor/backpacks.json b/data/json/items/armor/backpacks.json index 254206acd2998..e050e078f2ff1 100644 --- a/data/json/items/armor/backpacks.json +++ b/data/json/items/armor/backpacks.json @@ -319,7 +319,7 @@ "price": 6700, "price_postapoc": 11900, "rigid": false, - "material": [ "cotton", "kevlar" ], + "material": [ "cotton", "nylon" ], "symbol": "[", "looks_like": "backpack", "color": "green", diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 7a4270f2bea8c..aa51e3d7199d4 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -154,6 +154,50 @@ "environmental_protection": 2, "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] }, + { + "id": "boots_EOD", + "type": "ARMOR", + "name": "pair of EOD overboots", + "name_plural": "pairs of EOD overboots", + "description": "A cumbersome pair of thickly padded kevlar overboots, which will provide protection from shrapnel, heat and overpressure. Maybe a good idea to wear if you intend to interact with land mines on the regular.", + "weight": "1940 g", + "volume": "3 L", + "price": 31000, + "to_hit": -1, + "bashing": 1, + "material": [ "kevlar_layered", "nomex" ], + "symbol": "[", + "color": "dark_gray", + "covers": [ "FEET" ], + "coverage": 100, + "encumbrance": 45, + "warmth": 35, + "material_thickness": 6, + "environmental_protection": 2, + "flags": [ "OUTER", "STURDY" ] + }, + { + "id": "toecaps", + "type": "ARMOR", + "name": "pair of toecaps", + "name_plural": "pairs of toecaps", + "description": "Rubbery overshoes that cover your toes with sturdy, ANSI compliant steel toes.", + "weight": "907 g", + "volume": "1 L", + "price": 2500, + "to_hit": -1, + "bashing": 2, + "material": [ "plastic", "steel" ], + "symbol": "[", + "color": "brown", + "covers": [ "FEET" ], + "coverage": 15, + "encumbrance": 10, + "warmth": 10, + "material_thickness": 3, + "environmental_protection": 1, + "flags": [ "OUTER", "STURDY" ] + }, { "id": "boots_fsurvivor", "type": "ARMOR", diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 3068b3db9ade6..9f7255384bd92 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -259,7 +259,7 @@ "volume": "1 L", "price": 18000, "to_hit": 2, - "material": [ "kevlar", "nomex" ], + "material": [ "kevlar_layered", "nomex" ], "symbol": "[", "looks_like": "fire_gauntlets", "color": "light_gray", @@ -302,7 +302,7 @@ "volume": "1 L", "price": 18000, "to_hit": 2, - "material": [ "kevlar", "steel" ], + "material": [ "kevlar_layered", "steel" ], "symbol": "[", "looks_like": "fire_gauntlets", "color": "dark_gray", @@ -409,7 +409,7 @@ "volume": "750 ml", "price": 18000, "to_hit": 2, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "gloves_survivor", "color": "green", @@ -433,7 +433,7 @@ "volume": "700 ml", "price": 16000, "to_hit": 2, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "color": "green", "covers": [ "HANDS" ], @@ -522,7 +522,7 @@ "volume": "750 ml", "price": 18000, "to_hit": 2, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "fire_gauntlets", "color": "brown", diff --git a/data/json/items/armor/pets_dog_armor.json b/data/json/items/armor/pets_dog_armor.json index 32b4ed40e3dce..12d4070222522 100644 --- a/data/json/items/armor/pets_dog_armor.json +++ b/data/json/items/armor/pets_dog_armor.json @@ -10,7 +10,7 @@ "description": "A blue bulletproof harness, designed to be worn by canines in the service of local law enforcement, that protects from shoulders to abdomen. You could put this on a friendly dog.", "price": 30000, "price_postapoc": 3000, - "material": [ "kevlar" ], + "material": [ "kevlar_layered" ], "weight": "4290 g", "volume": "4500 ml", "bashing": 5, diff --git a/data/json/items/armor/pets_horse_armor.json b/data/json/items/armor/pets_horse_armor.json index 6e68706090474..dd487469b54c6 100644 --- a/data/json/items/armor/pets_horse_armor.json +++ b/data/json/items/armor/pets_horse_armor.json @@ -9,7 +9,7 @@ "description": "A heavy mattress-like armor of cloth, leather and thick linings of Kevlar, originally used as protection in bullfighting. You could put this on a friendly horse.", "price": 50000, "price_postapoc": 5000, - "material": [ "kevlar" ], + "material": [ "kevlar_layered" ], "weight": "30000 g", "volume": "150 L", "bashing": 10, diff --git a/data/json/items/migration.json b/data/json/items/migration.json index d930b0e8d342d..4f419d0e78171 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -929,6 +929,11 @@ "type": "MIGRATION", "replace": "taurus_spectrum_mag" }, + { + "id": "kevlar_plate", + "type": "MIGRATION", + "replace": "sheet_kevlar_layered" + }, { "id": "40mm_beanbag", "type": "MIGRATION", diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index cfeeb9801300a..4196ff6be3834 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -190,10 +190,10 @@ "type": "AMMO", "category": "spare_parts", "name": "Kevlar sheet", - "description": "A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor. In this form, unlike rigid plates, it can be stitched.", + "description": "A sheet of Kevlar synthetic fabric, suitable for making cut-resisant, durable clothing. In this form, unlike rigid plates, it can be stitched.", "weight": "5 g", "volume": "300 ml", - "price": 15000, + "price": 900, "material": "kevlar", "symbol": "=", "color": "dark_gray", @@ -215,6 +215,34 @@ "count": 100, "ammo_type": "components" }, + { + "id": "sheet_kevlar_layered", + "type": "TOOL", + "category": "spare_parts", + "name": "layered kevlar panel", + "description": "This is a small 16-layer thick Kevlar panel. It could be used to repair armor made of Kevlar.", + "weight": "80 g", + "volume": "600 ml", + "price": 15000, + "material": "kevlar_layered", + "flags": [ "NO_SALVAGE" ], + "symbol": ",", + "color": "green" + }, + { + "id": "rigid_kevlar_plate", + "type": "TOOL", + "category": "spare_parts", + "name": "rigid kevlar plate", + "description": "This is a compressed panel of kevlar treated with epoxy or other adhesive. It could be used to repair items made of Kevlar.", + "weight": "300 g", + "volume": "250 ml", + "price": 1000, + "material": "kevlar_rigid", + "flags": [ "NO_SALVAGE" ], + "symbol": ",", + "color": "green" + }, { "id": "sheet_lycra_patchwork", "copy-from": "sheet_lycra", diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 9ce6c85aa6be5..cbf7a6726770e 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -641,6 +641,51 @@ "target": "wearable_atomic_light" } }, + { + "id": "armor_EOD", + "type": "TOOL_ARMOR", + "category": "armor", + "copy-from": "armor_EOD_light", + "name": "EOD suit", + "description": "This is a massive suit constructed from kevlar and nomex for explosive ordnance disposal, complete with an armored full face helmet and boots. This garment will provide significant protection from overpressure, fragmentation, impact and heat. The electronically shielded helmet contains a camera, a two-way radio, and a headlamp, all of which can be voice-activated for redundancy. This likely has nothing to do with the suit's lack of gloves.", + "weight": "31298 g", + "volume": "10000 ml", + "price": 760000, + "covers": [ "HEAD", "MOUTH", "EYES", "TORSO", "ARMS", "LEGS", "FEET" ], + "encumbrance": 85, + "warmth": 65, + "charges_per_use": 1, + "turns_per_charge": 10, + "ammo": "battery", + "magazines": [ + [ + "battery", + [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + ] + ], + "magazine_well": 2, + "use_action": { + "type": "transform", + "menu_text": "Turn on headlamps", + "msg": "\"Activating illumination.\"", + "target": "armor_EOD_on", + "active": true, + "need_charges": 1, + "need_charges_msg": "\"Illumination disabled, low power.\"" + }, + "material_thickness": 8, + "extend": { "flags": [ "TWO_WAY_RADIO", "WATCH", "ALARMCLOCK" ] } + }, + { + "id": "armor_EOD_on", + "type": "TOOL_ARMOR", + "copy-from": "armor_EOD", + "name": "EOD suit (on)", + "extend": { "flags": [ "LIGHT_350", "CHARGEDIM", "TRADER_AVOID" ] }, + "power_draw": 10000, + "revert_to": "armor_EOD", + "use_action": { "type": "transform", "menu_text": "Turn off headlamps", "msg": "\"Disabling illumination.\"", "target": "armor_EOD" } + }, { "id": "rm13_armor", "type": "TOOL_ARMOR", @@ -651,7 +696,7 @@ "description": "Internally powered by a maximum of ten plutonium fuel cells, this full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology. Use it to turn it on.", "flags": [ "VARSIZE", "STURDY", "WATERPROOF", "RAINPROOF", "WATCH", "ALARMCLOCK", "SWIM_GOGGLES", "SUN_GLASSES", "RAD_RESIST" ], "price": 50000000, - "material": [ "ceramic", "kevlar" ], + "material": [ "ceramic", "kevlar_layered" ], "weight": "6820 g", "volume": "9 L", "to_hit": -3, @@ -1013,7 +1058,7 @@ "volume": "1250 ml", "price": 24000, "to_hit": -3, - "material": [ "kevlar", "nomex" ], + "material": [ "kevlar_layered", "nomex" ], "symbol": "[", "color": "light_gray", "covers": [ "MOUTH", "EYES" ], @@ -1040,7 +1085,7 @@ "volume": "1250 ml", "price": 24000, "to_hit": -3, - "material": [ "kevlar", "nomex" ], + "material": [ "kevlar_layered", "nomex" ], "symbol": "[", "color": "light_gray", "covers": [ "MOUTH", "EYES" ], @@ -1098,7 +1143,7 @@ "initial_charges": 100, "ammo": "gasfilter_m", "use_action": "GASMASK", - "material": [ "kevlar", "steel" ], + "material": [ "kevlar_layered", "steel" ], "symbol": "[", "color": "dark_gray", "covers": [ "MOUTH", "EYES" ], @@ -1126,7 +1171,7 @@ "charges_per_use": 1, "ammo": "gasfilter_m", "use_action": "GASMASK", - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "color": "dark_gray", "covers": [ "MOUTH", "EYES" ], @@ -1153,7 +1198,7 @@ "initial_charges": 100, "ammo": "gasfilter_m", "use_action": "GASMASK", - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "color": "dark_gray", "covers": [ "MOUTH", "EYES" ], @@ -1180,7 +1225,7 @@ "initial_charges": 100, "ammo": "gasfilter_m", "use_action": "GASMASK", - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "symbol": "[", "color": "dark_gray", "covers": [ "MOUTH", "EYES" ], @@ -1207,7 +1252,7 @@ "initial_charges": 100, "ammo": "gasfilter_m", "use_action": "GASMASK", - "material": [ "kevlar", "fur" ], + "material": [ "kevlar_layered", "fur" ], "symbol": "[", "color": "light_gray", "covers": [ "MOUTH", "EYES" ], @@ -1234,7 +1279,7 @@ "initial_charges": 100, "ammo": "gasfilter_m", "use_action": "GASMASK", - "material": [ "kevlar", "fur" ], + "material": [ "kevlar_layered", "fur" ], "symbol": "[", "color": "light_gray", "covers": [ "MOUTH", "EYES" ], @@ -1425,7 +1470,7 @@ "description": "A custom-built, armored rebreather mask that covers the face and eyes. It provides excellent protection from harm as well providing breathing gas while underwater. Use it to turn it on.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SWIM_GOGGLES" ], "price": 40000, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "weight": "982 g", "volume": "1500 ml", "to_hit": -3, @@ -1472,7 +1517,7 @@ "description": "A custom-built, armored rebreather mask that covers the face and eyes. It provides excellent protection from harm as well providing breathing gas while underwater. Use it to turn it on.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SWIM_GOGGLES", "OVERSIZE" ], "price": 40000, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_layered", "plastic" ], "weight": "1302 g", "volume": "2 L", "to_hit": -3, diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 772ffb8685549..82a51489cdd3e 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -3335,20 +3335,6 @@ "type": "transform" } }, - { - "id": "kevlar_plate", - "type": "TOOL", - "category": "spare_parts", - "name": "Kevlar plate", - "description": "This is a plate of reinforced Kevlar. It could be used to repair items made of Kevlar.", - "weight": "300 g", - "volume": "250 ml", - "price": 1000, - "material": "kevlar", - "symbol": ",", - "color": "green", - "flags": [ "NO_SALVAGE" ] - }, { "id": "kiln_done", "type": "TOOL", @@ -4158,7 +4144,7 @@ "use_action": { "type": "repair_item", "item_action_type": "repair_fabric", - "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "gutskin" ], + "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "kevlar_layered", "gutskin" ], "skill": "tailor", "tool_quality": -1, "cost_scaling": 0.1, @@ -5207,7 +5193,7 @@ "use_action": { "type": "repair_item", "item_action_type": "repair_fabric", - "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "gutskin" ], + "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "kevlar_layered", "gutskin" ], "skill": "tailor", "tool_quality": 0, "cost_scaling": 0.1, @@ -5763,7 +5749,20 @@ { "type": "repair_item", "item_action_type": "repair_fabric", - "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "neoprene", "gutskin" ], + "materials": [ + "cotton", + "leather", + "lycra", + "nylon", + "wool", + "fur", + "faux_fur", + "nomex", + "kevlar", + "kevlar_layered", + "neoprene", + "gutskin" + ], "skill": "tailor", "tool_quality": 1, "cost_scaling": 0.1, @@ -6407,7 +6406,7 @@ { "type": "repair_item", "item_action_type": "repair_metal", - "materials": [ "kevlar", "plastic", "iron", "steel", "hardsteel", "aluminum", "copper", "silver", "gold" ], + "materials": [ "kevlar", "kevlar_layered", "plastic", "iron", "steel", "hardsteel", "aluminum", "copper", "silver", "gold" ], "skill": "mechanics", "cost_scaling": 0.1, "move_cost": 1000 diff --git a/data/json/materials.json b/data/json/materials.json index 72ffef3b8e6e3..f9ea4992cdf02 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -670,6 +670,28 @@ "type": "material", "ident": "kevlar", "name": "Kevlar", + "density": 9, + "soft": true, + "reinforces": true, + "specific_heat_liquid": 0.82, + "specific_heat_solid": 0.45, + "latent_heat": 273, + "bash_resist": 1, + "cut_resist": 3, + "acid_resist": 5, + "fire_resist": 1, + "elec_resist": 2, + "chip_resist": 7, + "repaired_with": "sheet_kevlar", + "salvaged_into": "sheet_kevlar", + "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], + "bash_dmg_verb": "ripped", + "cut_dmg_verb": "cut" + }, + { + "type": "material", + "ident": "kevlar_layered", + "name": "Layered Kevlar", "density": 10, "specific_heat_liquid": 0.82, "specific_heat_solid": 0.45, @@ -681,8 +703,8 @@ "fire_resist": 3, "elec_resist": 2, "chip_resist": 20, - "repaired_with": "kevlar_plate", - "salvaged_into": "kevlar_plate", + "repaired_with": "sheet_kevlar_layered", + "salvaged_into": "sheet_kevlar_layered", "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], "bash_dmg_verb": "ripped", "cut_dmg_verb": "cut" @@ -701,9 +723,9 @@ "fire_resist": 3, "elec_resist": 2, "chip_resist": 20, - "repaired_with": "kevlar_plate", - "salvaged_into": "kevlar_plate", - "dmg_adj": [ "marked", "dented", "scarred", "broken" ], + "repaired_with": "rigid_kevlar_plate", + "salvaged_into": "rigid_kevlar_plate", + "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], "bash_dmg_verb": "ripped", "cut_dmg_verb": "cut" }, diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json index 2ace5aae10dfb..dfafdc35a9270 100644 --- a/data/json/monsterdrops/zombie_cop.json +++ b/data/json/monsterdrops/zombie_cop.json @@ -35,6 +35,7 @@ [ "heavy_flashlight", 35 ], [ "holster", 25 ], [ "kevlar", 35 ], + [ "armguard_cut_resistant", 2 ], [ "bholster", 3 ], [ "legpouch_large", 5 ], [ "pocket_firstaid", 10 ], @@ -48,7 +49,7 @@ { "id": "cop_gloves", "type": "item_group", - "items": [ [ "gloves_leather", 45 ], [ "gloves_medical", 20 ], [ "gloves_tactical", 10 ] ] + "items": [ [ "gloves_leather", 45 ], [ "gloves_medical", 20 ], [ "gloves_cut_resistant", 20 ], [ "gloves_tactical", 10 ] ] }, { "id": "cop_helmet", diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index c68493e638455..eb21803ee6c3b 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -674,7 +674,7 @@ [ "juice", 5 ], [ "kernels", 4 ], [ "ketchup", 4 ], - [ "kevlar_plate", 1 ], + [ "sheet_kevlar_layered", 1 ], [ "knee_pads", 4 ], [ "knife_butcher", 6 ], [ "knife_butter", 4 ], diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index d260dfb4e3cc5..3de024f7a1a28 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -63,7 +63,7 @@ "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "nomex", 8 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "duct_tape", 200 ] ], [ [ "nomex_socks", 1 ] ], [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_bunker", 1 ] ] @@ -97,7 +97,7 @@ "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "plastic_chunk", 4 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "duct_tape", 200 ] ], [ [ "wetsuit_booties", 1 ] ], [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_bunker", 1 ] ] @@ -119,7 +119,7 @@ [ [ "rag", 4 ] ], [ [ "leather", 4 ] ], [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "duct_tape", 100 ] ], [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] ] @@ -150,7 +150,7 @@ "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "rag", 8 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "duct_tape", 100 ] ], [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] ] @@ -198,7 +198,7 @@ "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "leather", 8 ], [ "tanned_hide", 2 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "duct_tape", 100 ] ], [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] ] @@ -241,7 +241,7 @@ "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "fur", 12 ], [ "tanned_pelt", 2 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "duct_tape", 100 ] ], [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] ] @@ -262,7 +262,7 @@ [ [ "leather", 24 ], [ "tanned_hide", 4 ] ], [ [ "rag", 6 ] ], [ [ "scrap", 4 ] ], - [ [ "boots_combat", 2 ], [ "kevlar_plate", 10 ] ], + [ [ "boots_combat", 2 ], [ "sheet_kevlar_layered", 10 ] ], [ [ "duct_tape", 200 ] ] ] }, diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index 7b9c0fe84baba..ef4cb13f64dbf 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -101,7 +101,7 @@ [ [ "nomex", 6 ] ], [ [ "leather", 2 ] ], [ [ "duct_tape", 120 ] ], - [ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "gloves_tactical", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "nomex_gloves", 1 ], [ "fire_gauntlets", 1 ] ] ] }, @@ -134,7 +134,7 @@ "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "duct_tape", 120 ] ], - [ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "gloves_tactical", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "wetsuit_gloves", 1 ] ] ] }, @@ -155,7 +155,7 @@ [ [ "leather", 2 ] ], [ [ "scrap", 4 ] ], [ [ "duct_tape", 50 ] ], - [ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "gloves_tactical", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "gloves_leather", 1 ], [ "gloves_light", 1 ], @@ -218,7 +218,7 @@ [ [ "rag", 6 ] ], [ [ "leather", 2 ] ], [ [ "duct_tape", 80 ] ], - [ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "gloves_tactical", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "gloves_leather", 1 ], [ "gloves_light", 1 ], @@ -269,7 +269,7 @@ [ [ "rag", 2 ] ], [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], [ [ "duct_tape", 80 ] ], - [ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "gloves_tactical", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "gloves_leather", 1 ], [ "gloves_light", 1 ], @@ -367,7 +367,7 @@ [ [ "rag", 2 ] ], [ [ "fur", 8 ], [ "tanned_pelt", 1 ] ], [ [ "duct_tape", 80 ] ], - [ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "gloves_tactical", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "gloves_leather", 1 ], [ "gloves_light", 1 ], @@ -394,7 +394,7 @@ [ [ "rag", 6 ] ], [ [ "scrap", 2 ] ], [ [ "duct_tape", 160 ] ], - [ [ "gloves_tactical", 2 ], [ "kevlar_plate", 6 ] ] + [ [ "gloves_tactical", 2 ], [ "sheet_kevlar_layered", 6 ] ] ] }, { diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index afc2e4cc4b9af..ed0cf677bcef9 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -420,7 +420,7 @@ "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "helmet_liner", 1 ], [ "hat_cotton", 1 ], [ "rag", 3 ] ], - [ [ "tac_helmet", 1 ], [ "tac_fullhelmet", 1 ], [ "helmet_army", 1 ], [ "kevlar_plate", 6 ] ], + [ [ "tac_helmet", 1 ], [ "tac_fullhelmet", 1 ], [ "helmet_army", 1 ], [ "sheet_kevlar_layered", 6 ] ], [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ], [ [ "duct_tape", 75 ] ], @@ -523,7 +523,7 @@ [ [ "hat_ball", 1 ], [ "hat_boonie", 1 ] ], [ [ "mask_filter", 1 ] ], [ [ "glasses_bal", 1 ], [ "goggles_ski", 1 ] ], - [ [ "kevlar_plate", 8 ] ] + [ [ "sheet_kevlar_layered", 8 ] ] ] }, { @@ -554,7 +554,7 @@ "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "helmet_liner", 1 ], [ "hat_cotton", 1 ], [ "rag", 3 ] ], - [ [ "tac_helmet", 1 ], [ "tac_fullhelmet", 1 ], [ "helmet_army", 1 ], [ "kevlar_plate", 6 ] ], + [ [ "tac_helmet", 1 ], [ "tac_fullhelmet", 1 ], [ "helmet_army", 1 ], [ "sheet_kevlar_layered", 6 ] ], [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], [ [ "leather", 8 ], [ "tanned_hide", 2 ] ], [ [ "duct_tape", 150 ] ], @@ -589,7 +589,7 @@ [ [ "rag", 6 ] ], [ [ "leather", 16 ], [ "tanned_hide", 3 ] ], [ [ "plastic_chunk", 20 ] ], - [ [ "kevlar_plate", 14 ] ], + [ [ "sheet_kevlar_layered", 14 ] ], [ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ], [ [ "duct_tape", 300 ] ] ] @@ -607,7 +607,7 @@ "book_learn": [ [ "textbook_fireman", 7 ] ], "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], - "components": [ [ [ "nomex", 8 ] ], [ [ "kevlar_plate", 4 ] ], [ [ "nomex_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ] + "components": [ [ [ "nomex", 8 ] ], [ [ "sheet_kevlar_layered", 4 ] ], [ [ "nomex_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ] }, { "result": "hood_h20survivor", @@ -621,7 +621,7 @@ "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], - "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "kevlar_plate", 4 ] ], [ [ "wetsuit_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ] + "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "sheet_kevlar_layered", 4 ] ], [ [ "wetsuit_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ] }, { "result": "hood_lsurvivor", @@ -635,7 +635,12 @@ "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], - "components": [ [ [ "rag", 8 ] ], [ [ "kevlar_plate", 4 ] ], [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], [ [ "duct_tape", 100 ] ] ] + "components": [ + [ [ "rag", 8 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], + [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], + [ [ "duct_tape", 100 ] ] + ] }, { "result": "hood_rain", @@ -664,7 +669,7 @@ "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], [ [ "rag", 2 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], [ [ "duct_tape", 100 ] ] ] @@ -684,7 +689,7 @@ "components": [ [ [ "fur", 8 ], [ "tanned_pelt", 1 ] ], [ [ "rag", 2 ] ], - [ [ "kevlar_plate", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], [ [ "duct_tape", 100 ] ] ] @@ -705,7 +710,7 @@ [ [ "leather", 14 ], [ "tanned_hide", 3 ] ], [ [ "rag", 4 ] ], [ [ "scrap", 2 ] ], - [ [ "kevlar_plate", 6 ] ], + [ [ "sheet_kevlar_layered", 6 ] ], [ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ], [ [ "duct_tape", 200 ] ] ] @@ -828,7 +833,7 @@ "book_learn": [ [ "textbook_fireman", 7 ], [ "atomic_survival", 8 ], [ "textbook_gaswarfare", 9 ] ], "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], - "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 4 ] ], [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ] ] + "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 4 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] ] }, { "result": "mask_fsurvivorxl", @@ -843,7 +848,7 @@ "book_learn": [ [ "textbook_fireman", 7 ], [ "atomic_survival", 8 ], [ "textbook_gaswarfare", 9 ] ], "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], - "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 8 ] ], [ [ "mask_bal", 1 ], [ "kevlar_plate", 6 ] ] ] + "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 8 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 6 ] ] ] }, { "result": "mask_gas", @@ -931,7 +936,7 @@ [ [ "rebreather", 1 ] ], [ [ "goggles_swim", 1 ] ], [ [ "plastic_chunk", 4 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ] + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] ] }, { @@ -950,7 +955,7 @@ [ [ "rebreather", 1 ] ], [ [ "goggles_swim", 1 ] ], [ [ "plastic_chunk", 8 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 6 ] ] + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 6 ] ] ] }, { @@ -970,7 +975,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "scrap", 3 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ] + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] ] }, { @@ -989,7 +994,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "rag", 3 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ] + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] ] }, { @@ -1032,7 +1037,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "leather", 3 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ] + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] ] }, { @@ -1051,7 +1056,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "leather", 6 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 6 ] ] + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 6 ] ] ] }, { @@ -1069,7 +1074,7 @@ "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ] }, @@ -1088,7 +1093,7 @@ "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], - [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ], + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ], [ [ "fur", 12 ], [ "tanned_pelt", 2 ] ] ] }, @@ -1319,7 +1324,7 @@ ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "leather", 3 ] ], - [ [ "kevlar_plate", 2 ] ] + [ [ "sheet_kevlar_layered", 2 ] ] ] }, { diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index e10e784d3d1ef..db23eb422d241 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -386,7 +386,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 50 ] ], - [ [ "kevlar_plate", 8 ] ] + [ [ "sheet_kevlar_layered", 8 ] ] ] }, { @@ -478,7 +478,7 @@ "using": [ [ "sewing_standard", 100 ] ], "components": [ [ [ "pants_army", 1 ], [ "pants_cargo", 1 ], [ "shorts_cargo", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 12 ] ], + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "sheet_kevlar_layered", 12 ] ], [ [ "rag", 12 ] ], [ [ "tacvest", 1 ], diff --git a/data/json/recipes/armor/pets_horse.json b/data/json/recipes/armor/pets_horse.json index a020d119a8d9d..437d78fcfa5d4 100644 --- a/data/json/recipes/armor/pets_horse.json +++ b/data/json/recipes/armor/pets_horse.json @@ -47,7 +47,7 @@ "time": "210 m", "autolearn": true, "using": [ [ "sewing_standard", 190 ] ], - "components": [ [ [ "kevlar_plate", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 24 ] ] ] + "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 24 ] ] ] }, { "result": "leather_armor_horse", diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index e59f57bf749ef..92c32a7b894a9 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -14,7 +14,7 @@ "components": [ [ [ "cleansuit", 1 ] ], [ [ "duct_tape", 600 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -32,7 +32,7 @@ "components": [ [ [ "hazmat_suit", 1 ] ], [ [ "duct_tape", 800 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -252,7 +252,7 @@ [ [ "fanny", 2 ], [ "dump_pouch", 1 ] ], [ [ "tool_belt", 1 ], [ "legrig", 1 ] ], [ [ "pants_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -418,9 +418,9 @@ "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "nomex", 40 ] ], - [ [ "kevlar_plate", 8 ] ], + [ [ "sheet_kevlar_layered", 8 ] ], [ [ "duct_tape", 200 ], [ "superglue", 5 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -452,7 +452,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 200 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -495,7 +495,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -527,7 +527,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -606,7 +606,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 200 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -661,7 +661,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -804,7 +804,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 24 ] ] ] }, { @@ -836,7 +836,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 48 ] ] + [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "sheet_kevlar_layered", 48 ] ] ] }, { @@ -868,7 +868,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 42 ] ] + [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "sheet_kevlar_layered", 42 ] ] ] }, { diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index b447dc1e799ce..b5fe3b884fa17 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -293,7 +293,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "duster_leather", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 16 ] ], + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "sheet_kevlar_layered", 16 ] ], [ [ "rag", 19 ] ], [ [ "tacvest", 1 ], @@ -488,7 +488,7 @@ [ "fanny", 1 ] ], [ [ "duct_tape", 150 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 16 ] ] + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "sheet_kevlar_layered", 16 ] ] ] }, { @@ -516,7 +516,7 @@ "decomp_learn": 4, "autolearn": true, "using": [ [ "sewing_standard", 30 ] ], - "components": [ [ [ "kevlar_plate", 24 ] ] ] + "components": [ [ [ "sheet_kevlar_layered", 24 ] ] ] }, { "result": "modularvestceramic", @@ -554,7 +554,7 @@ "reversible": true, "decomp_learn": 0, "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "kevlar_plate", 8 ] ] ], + "components": [ [ [ "modularvest", 1 ] ], [ [ "sheet_kevlar_layered", 8 ] ] ], "flags": [ "BLIND_EASY" ] }, { @@ -772,7 +772,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "duster_leather", 1 ], [ "jacket_army", 1 ], [ "sleeveless_duster", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 13 ] ], + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "sheet_kevlar_layered", 13 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ], @@ -913,7 +913,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "sleeveless_trenchcoat", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 10 ] ], + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "sheet_kevlar_layered", 10 ] ], [ [ "rag", 11 ] ], [ [ "tacvest", 1 ], @@ -1093,7 +1093,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 12 ] ], + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "sheet_kevlar_layered", 12 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ], @@ -1194,7 +1194,7 @@ "decomp_learn": 6, "autolearn": true, "using": [ [ "sewing_standard", 54 ] ], - "components": [ [ [ "kevlar_plate", 43 ] ] ] + "components": [ [ [ "sheet_kevlar_layered", 43 ] ] ] }, { "result": "vest_leather", diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 0ab7fd5efe5c0..b91b6619e5600 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1169,6 +1169,28 @@ "using": [ [ "sewing_standard", 50 ] ], "components": [ [ [ "rag", 20 ] ] ] }, + { + "type": "recipe", + "result": "sheet_kevlar_layered", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "tailor", + "time": "2 m", + "autolearn": true, + "reversible": true, + "using": [ [ "sewing_standard", 15 ] ], + "components": [ [ [ "sheet_kevlar", 16 ] ] ] + }, + { + "type": "recipe", + "result": "rigid_kevlar_plate", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "tailor", + "time": "15 m", + "autolearn": true, + "components": [ [ [ "sheet_kevlar", 16 ], [ "sheet_kevlar_layered", 1 ] ], [ [ "superglue", 1 ] ] ] + }, { "type": "recipe", "result": "vehicle_controls", diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json index 7cc231bf73d71..64343f2bba933 100644 --- a/data/json/requirements/tailoring.json +++ b/data/json/requirements/tailoring.json @@ -21,11 +21,18 @@ "components": [ [ [ "chitin_piece", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] }, { - "id": "armor_kevlar_plate", + "id": "armor_kevlar_rigid", "type": "requirement", "//": "Shaping and attaching a rigid Kevlar plate to something, per 300 g of rigid Kevlar. Time needed is 10 minutes per unit.", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "kevlar_plate", 1 ] ], [ [ "superglue", 1 ] ] ] + "components": [ [ [ "rigid_kevlar_plate", 1 ] ], [ [ "superglue", 1 ] ] ] + }, + { + "id": "armor_kevlar_layered", + "type": "requirement", + "//": "Joining kevlar panels together into something like a kevlar vest or other armor per 80 g of Kevlar. Time needed is 90 minutes per unit.", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "sheet_kevlar_layered", 1 ] ], [ [ "filament", 4, "LIST" ] ] ] }, { "id": "armor_steel_plate", @@ -224,11 +231,11 @@ "components": [ [ [ "fur", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] }, { - "id": "tailoring_kevlar", + "id": "tailoring_kevlar_fabric", "type": "requirement", "//": "Crafting Kevlar items, per 101 g of Kevlar; 10 g + excessive weight of material is wasted, producing Kevlar scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 2 }, { "id": "CUT", "level": 1 } ], - "components": [ [ [ "sheet_kevlar", 22 ] ], [ [ "thread_kevlar", 1 ] ] ] + "components": [ [ [ "sheet_kevlar", 22 ] ], [ [ "filament", 1, "LIST" ] ] ] }, { "id": "tailoring_leather", diff --git a/data/json/uncraft/armor/pets_dog.json b/data/json/uncraft/armor/pets_dog.json index eb7bcb2e48a0f..8358112964928 100644 --- a/data/json/uncraft/armor/pets_dog.json +++ b/data/json/uncraft/armor/pets_dog.json @@ -51,7 +51,7 @@ "difficulty": 1, "time": "10 s", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "kevlar_plate", 6 ] ] ] + "components": [ [ [ "sheet_kevlar_layered", 6 ] ] ] }, { "result": "rubber_harness_dog", diff --git a/data/json/uncraft/armor/suit.json b/data/json/uncraft/armor/suit.json index 52612425dd4e9..408a8dce08a5d 100644 --- a/data/json/uncraft/armor/suit.json +++ b/data/json/uncraft/armor/suit.json @@ -6,7 +6,7 @@ "difficulty": 3, "time": "5 m", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 33 ] ], [ [ "leather", 35 ] ], [ [ "scrap", 24 ] ], [ [ "kevlar_plate", 48 ] ] ] + "components": [ [ [ "rag", 33 ] ], [ [ "leather", 35 ] ], [ [ "scrap", 24 ] ], [ [ "sheet_kevlar_layered", 48 ] ] ] }, { "result": "xlsurvivor_suit", @@ -15,6 +15,6 @@ "difficulty": 3, "time": "150 s", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 23 ] ], [ [ "leather", 25 ] ], [ [ "scrap", 12 ] ], [ [ "kevlar_plate", 24 ] ] ] + "components": [ [ [ "rag", 23 ] ], [ [ "leather", 25 ] ], [ [ "scrap", 12 ] ], [ [ "sheet_kevlar_layered", 24 ] ] ] } ] diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index 0f254e78fbc28..f5ec3223375f8 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -1515,7 +1515,7 @@ "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } }, "flags": [ "FLOATS", "BOARDABLE" ], - "breaks_into": [ { "item": "kevlar_plate", "count": [ 1, 3 ] } ], + "breaks_into": [ { "item": "sheet_kevlar", "count": [ 1, 3 ] } ], "damage_reduction": { "all": 14 } }, { diff --git a/src/iuse_actor.h b/src/iuse_actor.h index a2b80e28091cd..7ae75b78d20e7 100644 --- a/src/iuse_actor.h +++ b/src/iuse_actor.h @@ -510,6 +510,7 @@ class salvage_actor : public iuse_actor material_id( "faux_fur" ), material_id( "fur" ), material_id( "kevlar" ), + material_id( "kevlar_layered" ), material_id( "kevlar_rigid" ), material_id( "leather" ), material_id( "lycra" ),