diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index f440201c3caee..ba816b48aac63 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -27,6 +27,7 @@ [ "lightstrip_inactive", 60 ], [ "compressor", 10 ], [ "hd_compressor", 2 ], + [ "magnet", 5 ], [ "motor_small", 10 ], [ "motor_tiny", 30 ], [ "motor_micro", 40 ], @@ -241,6 +242,7 @@ [ "solder_wire", 20 ], [ "superglue", 30 ], [ "rubber_cement", 25 ], + [ "magnet", 10 ], [ "chain", 20 ], [ "rope_6", 4 ], [ "rope_30", 35 ], diff --git a/data/json/items/generic/spares.json b/data/json/items/generic/spares.json index 126f3577c029a..619ada77cc257 100644 --- a/data/json/items/generic/spares.json +++ b/data/json/items/generic/spares.json @@ -145,6 +145,21 @@ "price": 40000, "price_postapoc": 2000 }, + { + "id": "magnet", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "magnet" }, + "description": "A small but strong permanent magnet made from alnico alloy, which produces a magnetic field that attracts ferromagnetic materials such as steel. Useful for crafting.", + "weight": "180 g", + "volume": "25 ml", + "price": 500, + "price_postapoc": 10, + "material": [ "iron" ], + "symbol": ",", + "color": "light_gray", + "ammo_type": "components" + }, { "id": "hd_pipe", "copy-from": "spare_part", diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 3572f1bf38ef9..ebe68d51348bb 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -90,6 +90,161 @@ "using": [ [ "strap_large", 1 ], [ "tailoring_leather_small", 6 ], [ "fastener_small", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] }, + { + "result": "camera_bag", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "skills_required": [ "fabrication", 2 ], + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 8 ], [ "fastener_large", 1 ], [ "fastener_small", 1 ], [ "plastic_molding", 2 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "canteen_pouch", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "time": "4 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 6 ], [ "fastener_small", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], + "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] + }, + { + "result": "deployment_bag", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "time": "6 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 9 ], [ "fastener_small", 2 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], + "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] + }, + { + "result": "fanny", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 2 ], + "difficulty": 4, + "time": "6 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 4 ], [ "fastener_small", 1 ], [ "clasps", 1 ], [ "plastic_molding", 1 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "dump_pouch", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 2 ], + "difficulty": 4, + "time": "6 h", + "autolearn": true, + "using": [ + [ "tailoring_nylon_patchwork", 10 ], + [ "fastener_small", 1 ], + [ "strap_small", 1 ], + [ "clasps", 1 ], + [ "plastic_molding", 1 ] + ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "santa_belt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "time": "1 h 30 m", + "autolearn": true, + "using": [ [ "tailoring_leather_small", 5 ], [ "clasps", 1 ] ], + "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] + }, + { + "result": "fireman_belt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "time": "2 h", + "autolearn": true, + "using": [ [ "tailoring_leather_small", 6 ], [ "clasps", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 } ], + "components": [ [ [ "scrap", 2 ] ] ], + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ] + }, + { + "result": "webbing_belt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 5, + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 8 ], [ "clasps", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 } ], + "components": [ [ [ "scrap", 2 ] ] ], + "proficiencies": [ { "proficiency": "prof_closures" } ] + }, + { + "result": "police_belt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "time": "2 h", + "autolearn": true, + "using": [ [ "tailoring_leather_small", 6 ], [ "clasps", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 } ], + "components": [ [ [ "scrap", 2 ] ] ], + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ] + }, + { + "result": "vest", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "time": "6 h", + "autolearn": true, + "using": [ [ "tailoring_cotton_patchwork", 14 ], [ "fastener_large", 1 ] ] + }, { "result": "chestrig", "type": "recipe", @@ -188,6 +343,70 @@ { "proficiency": "prof_leatherworking" } ] }, + { + "result": "slingpack", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 2 ], + "difficulty": 3, + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 12 ], [ "fastener_large", 1 ], [ "plastic_molding", 2 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "daypack", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 2 ], + "difficulty": 5, + "time": "12 h", + "autolearn": true, + "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 12 ], [ "fastener_large", 2 ], [ "plastic_molding", 2 ] ], + "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] + }, + { + "result": "purse", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 6, + "time": "18 h", + "autolearn": true, + "using": [ [ "tailoring_leather_patchwork", 2 ], [ "fastener_large", 2 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" } + ] + }, + { + "result": "runner_bag", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 2 ], + "difficulty": 5, + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_cotton_patchwork", 8 ], [ "fastener_large", 1 ], [ "plastic_molding", 2 ] ], + "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] + }, { "result": "baldric", "type": "recipe", @@ -626,6 +845,25 @@ ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, + { + "result": "shoulder_holster", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "skills_required": [ "pistol", 1 ], + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_leather_small", 6 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_leatherworking" }, + { "proficiency": "prof_leatherworking_basic" } + ], + "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] + }, { "result": "XS_holster", "type": "recipe", @@ -1357,6 +1595,20 @@ "reversible": true, "using": [ [ "tailoring_nylon_patchwork", 45 ], [ "strap_small", 10 ], [ "filament", 10 ] ] }, + { + "result": "heavy_load_bearing_vest_breacher", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 5, + "skills_required": [ "fabrication", 3 ], + "time": "60 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 45 ], [ "strap_small", 10 ], [ "filament", 10 ] ], + "components": [ [ [ "single_sling", 1 ] ], [ [ "magnet", 2 ] ] ] + }, { "result": "survivor_pack", "type": "recipe", @@ -1612,6 +1864,116 @@ "qualities": [ { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "sheet_metal_small", 8 ] ], [ [ "strap_large", 2, "LIST" ] ] ] }, + { + "result": "golf_bag", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 3 ], + "difficulty": 5, + "time": "14 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 12 ], [ "fastener_small", 2 ], [ "plastic_molding", 6 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 } ], + "components": [ [ [ "scrap", 4 ] ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "mbag", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "time": "14 h", + "autolearn": true, + "using": [ [ "tailoring_leather_patchwork", 3 ], [ "fastener_large", 2 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" } + ] + }, + { + "result": "rucksack", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 3 ], + "difficulty": 5, + "time": "30 h", + "autolearn": true, + "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 28 ], [ "fastener_large", 3 ], [ "plastic_molding", 4 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "molle_pack", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 3 ], + "difficulty": 5, + "time": "30 h", + "autolearn": true, + "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 24 ], [ "fastener_large", 3 ], [ "plastic_molding", 4 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "molle_medium_rucksack", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 3 ], + "difficulty": 5, + "time": "36 h", + "autolearn": true, + "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 36 ], [ "fastener_large", 3 ], [ "plastic_molding", 6 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, + { + "result": "molle_large_rucksack", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "skills_required": [ "fabrication", 3 ], + "difficulty": 5, + "time": "48 h", + "autolearn": true, + "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 42 ], [ "fastener_large", 4 ], [ "plastic_molding", 8 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_plasticworking" } + ] + }, { "result": "travelpack", "type": "recipe", diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 8015f72af0425..8e3fbabe8f741 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -13,6 +13,68 @@ "using": [ [ "tailoring_leather_patchwork", 7 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ] }, + { + "result": "apron_cotton", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 1, + "time": "3 h", + "autolearn": true, + "using": [ [ "tailoring_cotton_patchwork", 9 ] ] + }, + { + "result": "waist_apron_short", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 1, + "time": "1 h 30 m", + "autolearn": true, + "using": [ [ "tailoring_cotton_patchwork", 4 ] ] + }, + { + "result": "waist_apron_long", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 1, + "time": "2 h", + "autolearn": true, + "using": [ [ "tailoring_cotton_patchwork", 6 ] ] + }, + { + "result": "apron_plastic", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 1, + "time": "1 h", + "autolearn": true, + "using": [ [ "waterproofing_plastic_sheets", 8 ] ], + "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] + }, + { + "result": "apron_cut_resistant", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 3, + "time": "4 h", + "autolearn": true, + "using": [ [ "tailoring_kevlar_fabric", 6 ] ], + "proficiencies": [ { "proficiency": "prof_polymerworking" } ] + }, { "result": "armor_lamellar", "type": "recipe", diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json index 836b70d9cf865..95859d2784fcf 100644 --- a/data/json/recipes/tools/containers.json +++ b/data/json/recipes/tools/containers.json @@ -507,6 +507,21 @@ "using": [ [ "filament", 300 ], [ "cordage", 1 ] ], "components": [ [ [ "cotton_patchwork", 12 ] ] ] }, + { + "result": "storage_line", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_CONTAINERS", + "skill_used": "tailor", + "difficulty": 1, + "time": "1 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 2 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 } ], + "components": [ [ [ "scrap", 4 ] ] ], + "proficiencies": [ { "proficiency": "prof_closures" } ] + }, { "type": "recipe", "activity_level": "fake", diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index 0cb6fedff4ab7..752653f914ee7 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -44,6 +44,7 @@ alkyl alleghaniensis allosaurusid allucination +alnico altamente alternators alumentum