Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improvised ballistic plates in the style of scrap metal armor #57881

Merged
merged 3 commits into from
May 24, 2022
Merged

improvised ballistic plates in the style of scrap metal armor #57881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbfb066
improvised ballistic plates in the style of scrap metal armor
May 23, 2022
9becae2
oops, didn't mean to change that line. also, linting.
May 24, 2022
3a1f1bb
two spaces after every period
May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions data/json/items/armor/ballistic_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,37 @@
}
]
},
{
"id": "scrap_esapi_plate",
"type": "ARMOR",
"category": "armor",
"name": { "str": "scrap ESAPI plate" },
"//": "some crude metal chopped and bent to fit into a plate carrier. not great, but better than nothing. added the cotton component cause i'd imagine a jagged piece of metal would cut through a ballistic vest and this is based on the existing scrap armor",
"//2": "requested in https://github.com/CleverRaven/Cataclysm-DDA/issues/49477",
"description": "A flat piece of salvaged steel, crudely cut and bent into the shape of an ESAPI ballistic plate. It's wrapped in rags to cover the sharp edges. Better than nothing, but it's heavy, and not very strong. This is intended to be inserted into a ballistic vest, and can't be worn on its own.",
"weight": "900 g",
"//3": "30cm x 25cm x 1.5cm",
"volume": "188 ml",
"price": "50 USD",
"price_postapoc": "1 USD",
"material": [ "budget_steel", "cotton" ],
"symbol": ",",
"color": "dark_gray",
"material_thickness": 3,
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR" ],
"armor": [
{
"material": [
{ "type": "budget_steel", "covered_by_mat": 90, "thickness": 1.5 },
{ "type": "cotton", "covered_by_mat": 100, "thickness": 1 }
],
"encumbrance": 2,
"coverage": 45,
"covers": [ "torso" ],
"specifically_covers": [ "torso_upper" ]
}
]
},
{
"id": "esbi_plate",
"type": "ARMOR",
Expand All @@ -216,6 +247,37 @@
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR" ],
"armor": [ { "encumbrance": 1, "coverage": 35, "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ] } ]
},
{
"id": "scrap_esbi_plate",
"type": "ARMOR",
"category": "armor",
"name": { "str": "scrap ESBI plate" },
"//": "some crude metal chopped and bent to fit into a plate carrier. not great, but better than nothing. added the cotton component cause i'd imagine a jagged piece of metal would cut through a ballistic vest and this is based on the existing scrap armor",
"//2": "requested in https://github.com/CleverRaven/Cataclysm-DDA/issues/49477",
"description": "A flat piece of salvaged steel, crudely cut and bent into the shape of an ESAPI ballistic plate. It's wrapped in rags to cover the sharp edges. Better than nothing, but it's heavy, and not very strong. This is intended to be inserted into a ballistic vest, and can't be worn on its own.",
"weight": "450 g",
"//3": "18cm x 20cm x 1.5cm",
"volume": "188 ml",
"price": "30 USD",
"price_postapoc": "1 USD",
"material": [ "budget_steel", "cotton" ],
"symbol": ",",
"color": "dark_gray",
"material_thickness": 3,
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR" ],
"armor": [
{
"material": [
{ "type": "budget_steel", "covered_by_mat": 90, "thickness": 1.5 },
{ "type": "cotton", "covered_by_mat": 100, "thickness": 1 }
],
"encumbrance": 1,
"coverage": 35,
"covers": [ "torso" ],
"specifically_covers": [ "torso_lower" ]
}
]
},
{
"id": "destroyed_large_ceramic_plate",
"type": "ARMOR",
Expand Down
30 changes: 30 additions & 0 deletions data/json/recipes/armor/torso.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,36 @@
"components": [ [ [ "ballistic_vest_esapi", 1 ] ], [ [ "iotv_groin_plate", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "scrap_esapi_plate",
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_TORSO",
"skill_used": "fabrication",
"difficulty": 2,
"time": "30 m",
"autolearn": true,
"book_learn": [ [ "recipe_melee", 2 ] ],
"using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ],
"components": [ [ [ "rag", 3 ] ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ]
},
{
"result": "scrap_esbi_plate",
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_TORSO",
"skill_used": "fabrication",
"difficulty": 2,
"time": "30 m",
"autolearn": true,
"book_learn": [ [ "recipe_melee", 2 ] ],
"using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ],
"components": [ [ [ "rag", 2 ] ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ]
},
{
"result": "peacoat",
"type": "recipe",
Expand Down