Skip to content

Commit

Permalink
Merge pull request #76913 from Maleclypse/Fix-#76767
Browse files Browse the repository at this point in the history
Fix #76767
  • Loading branch information
Anton Burmistrov authored Oct 28, 2024
2 parents c6e6192 + d41edcf commit ad8047d
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions data/json/items/armor/ballistic_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"symbol": ",",
"color": "dark_gray",
"material_thickness": 5,
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR" ],
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "NO_SALVAGE" ],
"armor": [
{
"material": [
Expand Down Expand Up @@ -261,7 +261,7 @@
"material_thickness": 25,
"non_functional": "destroyed_large_ceramic_plate",
"damage_verb": "makes a crunch, something has shifted",
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR" ],
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "NO_SALVAGE" ],
"armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] } ]
},
{
Expand All @@ -280,7 +280,7 @@
"symbol": ",",
"color": "dark_gray",
"material_thickness": 3,
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY" ],
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY", "NO_SALVAGE" ],
"armor": [
{
"material": [
Expand Down Expand Up @@ -313,7 +313,7 @@
"symbol": ",",
"color": "dark_gray",
"material_thickness": 3,
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY" ],
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY", "NO_SALVAGE" ],
"armor": [
{
"material": [
Expand Down Expand Up @@ -346,7 +346,7 @@
"symbol": ",",
"color": "dark_gray",
"material_thickness": 6.35,
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY" ],
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY", "NO_SALVAGE" ],
"armor": [
{
"material": [ { "type": "qt_steel", "covered_by_mat": 100, "thickness": 6.35 } ],
Expand Down Expand Up @@ -403,7 +403,7 @@
"longest_side": "30 cm",
"material": [ { "type": "lc_steel", "portion": 4 }, { "type": "nylon" } ],
"repairs_with": [ "lc_steel" ],
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY" ],
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR", "STURDY", "NO_SALVAGE" ],
"armor": [
{
"material": [
Expand Down Expand Up @@ -473,7 +473,7 @@
"color": "light_gray",
"material_thickness": 14,
"damage_verb": "makes a crunch, something has shifted",
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR" ],
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR", "NO_SALVAGE" ],
"armor": [
{
"encumbrance": 8,
Expand Down Expand Up @@ -501,7 +501,7 @@
"material_thickness": 25,
"non_functional": "destroyed_medium_ceramic_plate",
"damage_verb": "makes a crunch, something has shifted",
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR" ],
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR", "NO_SALVAGE" ],
"armor": [ { "encumbrance": 1, "coverage": 35, "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ] } ]
},
{
Expand Down Expand Up @@ -550,7 +550,7 @@
"longest_side": "20 cm",
"material": [ { "type": "lc_steel", "portion": 4 }, { "type": "nylon" } ],
"repairs_with": [ "lc_steel" ],
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR", "STURDY" ],
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR", "STURDY", "NO_SALVAGE" ],
"armor": [
{
"material": [
Expand Down

0 comments on commit ad8047d

Please sign in to comment.