diff --git a/data/json/items/armor.json b/data/json/items/armor.json index ad2b431bb24af..b3d9e3deff28e 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -10022,7 +10022,7 @@ "type": "ARMOR", "category": "armor", "name": "XL survivor suit", - "description": "A massive home-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit. Protects from the elements as well as from harm.", + "description": "A massive hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit. Protects from the elements as well as from harm.", "weight": 12400, "volume": 72, "price": 150000, @@ -10036,7 +10036,31 @@ "encumbrance": 35, "storage": 34, "warmth": 15, - "material_thickness": 3, + "material_thickness": 4, + "environmental_protection": 3, + "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] + }, + { + "id": "xlhsurvivor_suit", + "type": "ARMOR", + "category": "armor", + "name": "XL heavy survivor suit", + "description": "A massive, heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit. Protects from the elements as well as from harm.", + "looks_like": "hsurvivor_suit", + "weight": 16500, + "volume": 75, + "price": 200000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar", "steel", "leather" ], + "symbol": "[", + "color": "dark_gray", + "covers": [ "LEGS", "TORSO", "ARMS" ], + "coverage": 100, + "encumbrance": 45, + "storage": 30, + "warmth": 15, + "material_thickness": 6, "environmental_protection": 3, "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index 53548aa4872d4..7e1cd421e4bb5 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -356,5 +356,38 @@ "flags": [ "MAG_COMPACT" ] }, "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "xlkevlar", + "type": "ARMOR", + "category": "armor", + "name": "XL kevlar vest", + "description": "A massive, hand-built kevlar vest based on the design of existing bullet resistant vests. It has four pouches capable of carrying magazines.", + "looks_like": "modularvest", + "weight": 5148, + "volume": 43, + "price": 200000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 17, + "storage": 10, + "warmth": 15, + "material_thickness": 4, + "use_action": { + "type": "holster", + "holster_prompt": "Stash ammo", + "holster_msg": "You stash your %s.", + "multi": 4, + "min_volume": 1, + "max_volume": 4, + "draw_cost": 60, + "flags": [ "MAG_COMPACT" ] + }, + "flags": [ "OVERSIZE", "STURDY", "OUTER" ] } ] diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index de32b2adc7eb2..167030547d2e8 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -766,6 +766,38 @@ [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, + { + "result": "xlhsurvivor_suit", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_SUIT", + "skill_used": "tailor", + "difficulty": 8, + "skills_required": [ "fabrication", 8 ], + "time": "540 m", + "autolearn": true, + "using": [ [ "sewing_standard", 200 ] ], + "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], + "components": [ + [ [ "rag", 30 ] ], + [ [ "leather", 40 ], [ "tanned_hide", 7 ] ], + [ [ "steel_chunk", 8 ], [ "scrap", 24 ] ], + [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], + [ + [ "chestrig", 1 ], + [ "legrig", 1 ], + [ "vest", 1 ], + [ "tool_belt", 1 ], + [ "ragpouch", 6 ], + [ "leather_pouch", 4 ], + [ "dump_pouch", 1 ], + [ "purse", 2 ], + [ "fanny", 2 ] + ], + [ [ "duct_tape", 400 ] ], + [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 48 ] ] + ] + }, { "result": "xlsurvivor_suit", "type": "recipe", diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 44f373de23b8b..04d04a06d9afe 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -1067,6 +1067,20 @@ "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 4 ] ] ] }, + { + "result": "xlkevlar", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 6, + "time": "50 m", + "reversible": true, + "decomp_learn": 6, + "autolearn": true, + "using": [ [ "sewing_standard", 54 ] ], + "components": [ [ [ "kevlar_plate", 43 ] ] ] + }, { "result": "vest_leather", "type": "recipe", diff --git a/data/json/uncraft/armor/suit.json b/data/json/uncraft/armor/suit.json new file mode 100644 index 0000000000000..3c103fa7af3bb --- /dev/null +++ b/data/json/uncraft/armor/suit.json @@ -0,0 +1,20 @@ +[ + { + "result": "xlhsurvivor_suit", + "type": "uncraft", + "skill_used": "tailor", + "difficulty": 3, + "time": 30000, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "rag", 33 ] ], [ [ "leather", 35 ] ], [ [ "scrap", 24 ] ], [ [ "kevlar", 48 ] ] ] + }, + { + "result": "xlsurvivor_suit", + "type": "uncraft", + "skill_used": "tailor", + "difficulty": 3, + "time": 15000, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "rag", 23 ] ], [ [ "leather", 25 ] ], [ [ "scrap", 12 ] ], [ [ "kevlar", 24 ] ] ] + } +] diff --git a/data/mods/No_Survivor_Armor/survivor.json b/data/mods/No_Survivor_Armor/survivor.json index 1be4a7f9f22f6..c191a18d422d5 100644 --- a/data/mods/No_Survivor_Armor/survivor.json +++ b/data/mods/No_Survivor_Armor/survivor.json @@ -43,6 +43,7 @@ "helmet_survivor", "helmet_hsurvivor", "xlsurvivor_suit", + "xlhsurvivor_suit", "gloves_xlsurvivor", "boots_xlsurvivor", "hood_xlsurvivor",