From cd3c812c6f73efd7770a70672e8fc8c4b63c784a Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Tue, 1 Nov 2022 16:23:36 -0500
Subject: [PATCH 01/22] modernize riot armor

---
 data/json/items/armor/suits_protection.json | 58 +++++++++++++++++----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index f328802f6a3bb..470717de927e3 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1375,23 +1375,61 @@
     "category": "armor",
     "name": { "str": "riot armor" },
     "description": "Black plastic body armor plates used by riot police officers, back when they were just riots.  The word POLICE is emblazoned across the front.",
-    "weight": "1000 g",
-    "volume": "7500 ml",
-    "price": 35000,
-    "price_postapoc": 1500,
+    "weight": "5 kg",
+    "volume": "12500 ml",
+    "price": 80000,
+    "price_postapoc": 3000,
     "to_hit": -3,
-    "material": [ "thermo_resin", "plastic" ],
+    "material": [ "thermo_resin", "nylon", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "kevlar",
     "color": "light_gray",
-    "warmth": 10,
+    "warmth": 35,
     "longest_side": "60 cm",
-    "material_thickness": 2.5,
     "flags": [ "STURDY", "OUTER" ],
+    "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
     "armor": [
-      { "encumbrance": 7, "coverage": 60, "covers": [ "torso" ] },
-      { "encumbrance": 7, "coverage": 55, "covers": [ "leg_l", "leg_r" ] },
-      { "encumbrance": 7, "coverage": 60, "covers": [ "arm_l", "arm_r" ] }
+      {
+        "encumbrance": 8,
+        "coverage": 100,
+        "covers": [ "torso" ],
+        "material": [
+          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
+        ]
+      },
+      {
+        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
+        "encumbrance": 6,
+        "coverage": 100,
+        "material": [
+          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
+        ],
+        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "leg_lower_l", "leg_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r" ]
+      },
+      {
+        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
+        "coverage": 100,
+        "material": [
+          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
+          { "type": "plastic_pad", "covered_by_mat": 85, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 70, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
+      },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "coverage": 100,
+        "material": [
+          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 10, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
+      }
     ]
   },
   {

From 5f8e0cf9f2b0f157a2ebfeb2e4b028b869dffd3c Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Tue, 1 Nov 2022 16:45:01 -0500
Subject: [PATCH 02/22] updates

---
 data/json/items/armor/suits_protection.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 470717de927e3..3ef7c980fdd40 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1377,7 +1377,7 @@
     "description": "Black plastic body armor plates used by riot police officers, back when they were just riots.  The word POLICE is emblazoned across the front.",
     "weight": "5 kg",
     "volume": "12500 ml",
-    "price": 80000,
+    "price": 60000,
     "price_postapoc": 3000,
     "to_hit": -3,
     "material": [ "thermo_resin", "nylon", "plastic_pad" ],
@@ -1390,13 +1390,13 @@
     "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
     "armor": [
       {
-        "encumbrance": 8,
+        "encumbrance": 7,
         "coverage": 100,
         "covers": [ "torso" ],
         "material": [
           { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 3 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 3 }
         ]
       },
       {
@@ -1406,19 +1406,19 @@
         "material": [
           { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
           { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
         ],
-        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "leg_lower_l", "leg_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r" ]
+        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r" ]
       },
       {
         "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
         "coverage": 100,
         "material": [
           { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
-          { "type": "plastic_pad", "covered_by_mat": 85, "thickness": 2 },
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
           { "type": "thermo_resin", "covered_by_mat": 70, "thickness": 1.5 }
         ],
-        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r", "leg_lower_l", "leg_lower_r" ]
       },
       {
         "covers": [ "leg_l", "leg_r" ],
@@ -1426,7 +1426,7 @@
         "material": [
           { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
           { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 10, "thickness": 1.5 }
+          { "type": "thermo_resin", "covered_by_mat": 15, "thickness": 1.5 }
         ],
         "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
       }

From 266eb30254f3711f1c0c69007e751723187c2a6f Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Tue, 1 Nov 2022 16:45:26 -0500
Subject: [PATCH 03/22] lint

---
 data/json/items/armor/suits_protection.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 3ef7c980fdd40..9102f88ce9181 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1418,7 +1418,16 @@
           { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
           { "type": "thermo_resin", "covered_by_mat": 70, "thickness": 1.5 }
         ],
-        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r", "leg_lower_l", "leg_lower_r" ]
+        "specifically_covers": [
+          "arm_shoulder_l",
+          "arm_shoulder_r",
+          "arm_upper_l",
+          "arm_upper_r",
+          "leg_upper_l",
+          "leg_upper_r",
+          "leg_lower_l",
+          "leg_lower_r"
+        ]
       },
       {
         "covers": [ "leg_l", "leg_r" ],

From 641d30a1ddcc1d54491f4d1fcc0898b1254e4f8b Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Tue, 1 Nov 2022 16:58:38 -0500
Subject: [PATCH 04/22] repairs like

---
 data/json/items/armor/suits_protection.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 9102f88ce9181..8f85fc8e102b8 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1370,7 +1370,7 @@
   },
   {
     "id": "armor_riot",
-    "repairs_like": "survivor_suit",
+    "repairs_like": "armor_larmor",
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "riot armor" },

From b25fa1bcec20116abe7843fdc8e9dc70af91ce60 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 10:47:52 -0500
Subject: [PATCH 05/22] modularize armor

---
 .../itemgroups/Clothing_Gear/clothing.json    |  3 ++
 .../Locations_MapExtras/locations.json        |  7 +--
 data/json/items/armor/arms_armor.json         | 31 +++++++++++
 data/json/items/armor/legs_armor.json         | 38 +++++++++++++
 data/json/items/armor/suits_protection.json   | 54 +++++++++++--------
 data/json/items/armor/torso_armor.json        | 51 ++++++++++++++++++
 data/json/recipes/armor/suit.json             | 14 +++++
 data/json/recipes/recipe_deconstruction.json  |  7 +++
 8 files changed, 179 insertions(+), 26 deletions(-)

diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
index 3df0c6dd10cb4..cefe97b08e285 100644
--- a/data/json/itemgroups/Clothing_Gear/clothing.json
+++ b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -2799,6 +2799,9 @@
       [ "chestguard_hard", 20 ],
       [ "armguard_hard", 20 ],
       [ "legguard_hard", 15 ],
+      [ "armor_riot_leg", 10],
+      [ "armor_riot_arm", 10],
+      [ "armor_riot_torso", 5],
       [ "under_armor", 20 ],
       [ "long_underpants", 40 ],
       [ "long_undertop", 40 ],
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
index aed9701a28628..0ced0470f9ab9 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1530,10 +1530,11 @@
     "items": [
       [ "helmet_riot", 25 ],
       { "item": "mask_gas", "prob": 25, "charges": [ 0, 100 ] },
-      [ "armor_riot", 20 ],
+      [ "armor_riot", 25 ],
+      [ "armor_riot_arm", 15 ],
+      [ "armor_riot_leg", 15 ],
+      [ "armor_riot_torso", 5 ],
       [ "gloves_tactical", 10 ],
-      [ "armguard_hard", 20 ],
-      [ "legguard_hard", 20 ],
       [ "emergency_book", 1 ]
     ]
   },
diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index e1bc6c0f272d6..c18f743d2dd78 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -1638,5 +1638,36 @@
     "material_thickness": 2.5,
     "environmental_protection": 1,
     "flags": [ "VARSIZE", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "armor_riot_arm",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of riot arm guards" },
+    "description": "Hard arm guards used by riot police.",
+    "weight": "500 g",
+    "volume": "2500 ml",
+    "price": 10000,
+    "price_postapoc": 500,
+    "to_hit": -3,
+    "material": [ "thermo_resin", "plastic_pad" ],
+    "symbol": "[",
+    "looks_like": "armguard_hard",
+    "color": "dark_gray",
+    "warmth": 20,
+    "longest_side": "40 cm",
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
+    "armor": [
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "encumbrance": 3,
+        "coverage": 95,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+        ],
+        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r" ]
+      }
+    ]
   }
 ]
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index eb7265b7f5ada..70ef631898760 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1572,5 +1572,43 @@
     "warmth": 25,
     "material_thickness": 2.0,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "armor_riot_leg",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of riot leg guards" },
+    "description": "Hard leg guards used by riot police.",
+    "weight": "500 g",
+    "volume": "2500 ml",
+    "price": 10000,
+    "price_postapoc": 500,
+    "to_hit": -3,
+    "material": [ "thermo_resin", "plastic_pad" ],
+    "symbol": "[",
+    "looks_like": "legguard_hard",
+    "color": "dark_gray",
+    "warmth": 20,
+    "longest_side": "40 cm",
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
+    "armor": [
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "encumbrance": 3,
+        "coverage": 95,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+        ],
+        "specifically_covers": [ "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "encumbrance": 2,
+        "coverage": 95,
+        "material": [ { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 } ],
+        "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
+      }
+    ]
   }
 ]
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 8f85fc8e102b8..66fd6b00b61e3 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1370,53 +1370,50 @@
   },
   {
     "id": "armor_riot",
-    "repairs_like": "armor_larmor",
+    "repairs_like": "survivor_suit",
     "type": "ARMOR",
     "category": "armor",
-    "name": { "str": "riot armor" },
-    "description": "Black plastic body armor plates used by riot police officers, back when they were just riots.  The word POLICE is emblazoned across the front.",
-    "weight": "5 kg",
+    "name": { "str": "riot armor suit" },
+    "description": "A full suit of black plastic body armor plates used by riot police officers.  Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts.  Molle webbing is attached to the thighs.  The word POLICE is emblazoned across the front.",
+    "weight": "3 kg",
     "volume": "12500 ml",
     "price": 60000,
     "price_postapoc": 3000,
     "to_hit": -3,
-    "material": [ "thermo_resin", "nylon", "plastic_pad" ],
+    "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "kevlar",
     "color": "light_gray",
-    "warmth": 35,
+    "warmth": 20,
     "longest_side": "60 cm",
-    "flags": [ "STURDY", "OUTER" ],
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
     "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
     "armor": [
       {
         "encumbrance": 7,
-        "coverage": 100,
+        "coverage": 95,
         "covers": [ "torso" ],
         "material": [
-          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 3 },
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
           { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 3 }
         ]
       },
       {
         "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
-        "encumbrance": 6,
-        "coverage": 100,
+        "encumbrance": 4,
+        "coverage": 95,
         "material": [
-          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
           { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
           { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
         ],
-        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r" ]
+        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
       },
       {
-        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
-        "coverage": 100,
+        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ],
+        "coverage": 95,
         "material": [
-          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
           { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 70, "thickness": 1.5 }
+          { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 }
         ],
         "specifically_covers": [
           "arm_shoulder_l",
@@ -1424,18 +1421,29 @@
           "arm_upper_l",
           "arm_upper_r",
           "leg_upper_l",
-          "leg_upper_r",
-          "leg_lower_l",
-          "leg_lower_r"
+          "leg_upper_r"
+        ]
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "encumbrance": 2,
+        "coverage": 95,
+        "material": [
+          { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 }
+        ],
+        "specifically_covers": [
+            "foot_arch_l",
+            "foot_arch_r",
+            "foot_ankle_r",
+            "foot_ankle_l"
         ]
       },
       {
         "covers": [ "leg_l", "leg_r" ],
         "coverage": 100,
         "material": [
-          { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 },
           { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 15, "thickness": 1.5 }
+          { "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
         ],
         "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
       }
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index bd6c5f5ba33dd..c57864428a3c0 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -1843,5 +1843,56 @@
     "material_thickness": 2.5,
     "environmental_protection": 2,
     "flags": [ "VARSIZE", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "armor_riot_torso",
+    "repairs_like": "armor_larmor",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "riot armor chest piece" },
+    "description": "A hard chest protector, attached to thigh and upper arm guards. Used by riot police officers.  Molle webbing is attached to the thighs.  The word POLICE is emblazoned across the front.",
+    "weight": "2 kg",
+    "volume": "10000 ml",
+    "price": 40000,
+    "price_postapoc": 2000,
+    "to_hit": -3,
+    "material": [ "thermo_resin", "plastic_pad" ],
+    "symbol": "[",
+    "looks_like": "chestguard_hard",
+    "color": "dark_gray",
+    "warmth": 20,
+    "longest_side": "60 cm",
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
+    "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
+    "armor": [
+      {
+        "encumbrance": 7,
+        "coverage": 95,
+        "covers": [ "torso" ],
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 3 }
+        ]
+      },
+      {
+        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
+        "encumbrance": 2,
+        "coverage": 95,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 70, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
+      },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "coverage": 100,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 15, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
+      }
+    ]
   }
 ]
diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json
index 0cfec0be246f0..5facadc08d9f4 100644
--- a/data/json/recipes/armor/suit.json
+++ b/data/json/recipes/armor/suit.json
@@ -3367,5 +3367,19 @@
       [ [ "xl_armor_qt_heavyarmguard", 2 ] ],
       [ [ "xl_armor_qt_heavy_leg_guard", 2 ] ]
     ]
+  },
+  {
+    "result": "armor_riot",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "id_suffix": "assembly",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "fabrication",
+    "time": "2 m",
+    "reversible": true,
+    "autolearn": true,
+    "flags": [ "NO_RESIZE" ],
+    "components": [ [ [ "armor_riot_leg", 1 ] ], [ [ "armor_riot_arm", 1 ] ], [ [ "armor_riot_torso", 1 ] ] ]
   }
 ]
diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
index 4e7968cb015a1..a6d3aa02df5a4 100644
--- a/data/json/recipes/recipe_deconstruction.json
+++ b/data/json/recipes/recipe_deconstruction.json
@@ -7163,5 +7163,12 @@
     "time": "1 s",
     "components": [ [ [ "cardboard", 1 ] ] ],
     "flags": [ "BLIND_EASY" ]
+  },
+  {
+    "result": "armor_riot",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "time": "1 m",
+    "components": [ [ [ "armor_riot_leg", 1 ] ], [ [ "armor_riot_arm", 1 ] ], [ [ "armor_riot_torso", 1 ] ] ]
   }
 ]

From 3c1fe88100764a59ce042ddda4df7221de84cbc2 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 10:52:03 -0500
Subject: [PATCH 06/22] spelling plural fix

---
 data/json/items/armor/arms_armor.json | 5 ++++-
 data/json/items/armor/legs_armor.json | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index c18f743d2dd78..17db13ad9dfb0 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -1643,7 +1643,10 @@
     "id": "armor_riot_arm",
     "type": "ARMOR",
     "category": "armor",
-    "name": { "str": "pair of riot arm guards" },
+    "name": {
+      "str": "pair of riot arm guards",
+      "str_pl": "pairs of riot arm guards"
+    },
     "description": "Hard arm guards used by riot police.",
     "weight": "500 g",
     "volume": "2500 ml",
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index 70ef631898760..59a37a2b65f9d 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1577,7 +1577,10 @@
     "id": "armor_riot_leg",
     "type": "ARMOR",
     "category": "armor",
-    "name": { "str": "pair of riot leg guards" },
+    "name": {
+      "str": "pair of riot leg guards",
+      "str_pl": "pairs of riot leg guards"
+    },  
     "description": "Hard leg guards used by riot police.",
     "weight": "500 g",
     "volume": "2500 ml",

From f70b34b608756dbb1dfe83a6f804d621ffad299d Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 10:53:25 -0500
Subject: [PATCH 07/22] name change

---
 data/json/items/armor/torso_armor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index c57864428a3c0..2e8447a8ceda1 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -1849,7 +1849,7 @@
     "repairs_like": "armor_larmor",
     "type": "ARMOR",
     "category": "armor",
-    "name": { "str": "riot armor chest piece" },
+    "name": { "str": "riot chest guard" },
     "description": "A hard chest protector, attached to thigh and upper arm guards. Used by riot police officers.  Molle webbing is attached to the thighs.  The word POLICE is emblazoned across the front.",
     "weight": "2 kg",
     "volume": "10000 ml",

From dca15d4d5b4a625dd6087cc85a4c030d75080c95 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 11:06:36 -0500
Subject: [PATCH 08/22] lint

---
 data/json/itemgroups/Clothing_Gear/clothing.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
index cefe97b08e285..20f2d9d282ae7 100644
--- a/data/json/itemgroups/Clothing_Gear/clothing.json
+++ b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -2799,9 +2799,9 @@
       [ "chestguard_hard", 20 ],
       [ "armguard_hard", 20 ],
       [ "legguard_hard", 15 ],
-      [ "armor_riot_leg", 10],
-      [ "armor_riot_arm", 10],
-      [ "armor_riot_torso", 5],
+      [ "armor_riot_leg", 10 ],
+      [ "armor_riot_arm", 10 ],
+      [ "armor_riot_torso", 5 ],
       [ "under_armor", 20 ],
       [ "long_underpants", 40 ],
       [ "long_undertop", 40 ],

From fc31dbfe77fae7e332bbc782b9f4f04be48d5bfb Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 11:21:21 -0500
Subject: [PATCH 09/22] lint

---
 data/json/items/armor/arms_armor.json       |  5 +----
 data/json/items/armor/legs_armor.json       |  5 +----
 data/json/items/armor/suits_protection.json | 23 ++++-----------------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index 17db13ad9dfb0..ae7086f11c474 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -1643,10 +1643,7 @@
     "id": "armor_riot_arm",
     "type": "ARMOR",
     "category": "armor",
-    "name": {
-      "str": "pair of riot arm guards",
-      "str_pl": "pairs of riot arm guards"
-    },
+    "name": { "str": "pair of riot arm guards", "str_pl": "pairs of riot arm guards" },
     "description": "Hard arm guards used by riot police.",
     "weight": "500 g",
     "volume": "2500 ml",
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index 59a37a2b65f9d..f3cd16a727f18 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1577,10 +1577,7 @@
     "id": "armor_riot_leg",
     "type": "ARMOR",
     "category": "armor",
-    "name": {
-      "str": "pair of riot leg guards",
-      "str_pl": "pairs of riot leg guards"
-    },  
+    "name": { "str": "pair of riot leg guards", "str_pl": "pairs of riot leg guards" },
     "description": "Hard leg guards used by riot police.",
     "weight": "500 g",
     "volume": "2500 ml",
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 66fd6b00b61e3..c0385d0f63953 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1370,7 +1370,6 @@
   },
   {
     "id": "armor_riot",
-    "repairs_like": "survivor_suit",
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "riot armor suit" },
@@ -1383,7 +1382,7 @@
     "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "kevlar",
-    "color": "light_gray",
+    "color": "dark_gray",
     "warmth": 20,
     "longest_side": "60 cm",
     "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
@@ -1415,28 +1414,14 @@
           { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
           { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 }
         ],
-        "specifically_covers": [
-          "arm_shoulder_l",
-          "arm_shoulder_r",
-          "arm_upper_l",
-          "arm_upper_r",
-          "leg_upper_l",
-          "leg_upper_r"
-        ]
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
       },
       {
         "covers": [ "foot_l", "foot_r" ],
         "encumbrance": 2,
         "coverage": 95,
-        "material": [
-          { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 }
-        ],
-        "specifically_covers": [
-            "foot_arch_l",
-            "foot_arch_r",
-            "foot_ankle_r",
-            "foot_ankle_l"
-        ]
+        "material": [ { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 } ],
+        "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
       },
       {
         "covers": [ "leg_l", "leg_r" ],

From c102533ae5d3e6face2162d88db5a0d01c4159a5 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 11:41:24 -0500
Subject: [PATCH 10/22] space

---
 data/json/items/armor/torso_armor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 2e8447a8ceda1..27b93698fc629 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -1850,7 +1850,7 @@
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "riot chest guard" },
-    "description": "A hard chest protector, attached to thigh and upper arm guards. Used by riot police officers.  Molle webbing is attached to the thighs.  The word POLICE is emblazoned across the front.",
+    "description": "A hard chest protector, attached to thigh and upper arm guards.  Used by riot police officers.  Molle webbing is attached to the thighs.  The word POLICE is emblazoned across the front.",
     "weight": "2 kg",
     "volume": "10000 ml",
     "price": 40000,

From 0d40583a39192973b7947a3d98ffbc70bf2a0c11 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 12:10:09 -0500
Subject: [PATCH 11/22] desc

---
 data/json/items/armor/suits_protection.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index c0385d0f63953..0672c93e5050c 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1373,7 +1373,7 @@
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "riot armor suit" },
-    "description": "A full suit of black plastic body armor plates used by riot police officers.  Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts.  Molle webbing is attached to the thighs.  The word POLICE is emblazoned across the front.",
+    "description": "A full suit of black plastic body armor plates used by riot police officers.  Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts.  Molle webbing is attached to the thighs and the word POLICE is emblazoned across the front.",
     "weight": "3 kg",
     "volume": "12500 ml",
     "price": 60000,

From f362fdb1c582450cf2e855a723a53c896814fcd2 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 12:18:23 -0500
Subject: [PATCH 12/22] coverage fixes

---
 data/json/items/armor/legs_armor.json       | 2 +-
 data/json/items/armor/suits_protection.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index f3cd16a727f18..4c969d3a0dec0 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1605,7 +1605,7 @@
       {
         "covers": [ "foot_l", "foot_r" ],
         "encumbrance": 2,
-        "coverage": 95,
+        "coverage": 75,
         "material": [ { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 } ],
         "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
       }
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 0672c93e5050c..e1186a6137c08 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1419,7 +1419,7 @@
       {
         "covers": [ "foot_l", "foot_r" ],
         "encumbrance": 2,
-        "coverage": 95,
+        "coverage": 75,
         "material": [ { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 } ],
         "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
       },

From d1eec885fc2a86182af6143043ca21119db6b5c9 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 12:19:02 -0500
Subject: [PATCH 13/22] descrption

---
 data/json/items/armor/suits_protection.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index e1186a6137c08..8656d76ff5c25 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1373,7 +1373,7 @@
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "riot armor suit" },
-    "description": "A full suit of black plastic body armor plates used by riot police officers.  Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts.  Molle webbing is attached to the thighs and the word POLICE is emblazoned across the front.",
+    "description": "A full suit of black plastic body armor plates used by riot police.  Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts.  Molle webbing is attached to the thighs and the word POLICE is emblazoned across the front.",
     "weight": "3 kg",
     "volume": "12500 ml",
     "price": 60000,

From c36f9df1cb41315f1010b57792fa2c99f3451312 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 12:37:37 -0500
Subject: [PATCH 14/22] coverage fixes

---
 data/json/items/armor/arms_armor.json       |  4 ++--
 data/json/items/armor/legs_armor.json       |  6 +++---
 data/json/items/armor/suits_protection.json | 18 +++++++++---------
 data/json/items/armor/torso_armor.json      | 14 +++++++-------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index ae7086f11c474..529adcf601c13 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -1663,8 +1663,8 @@
         "encumbrance": 3,
         "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
         ],
         "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r" ]
       }
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index 4c969d3a0dec0..554b222df2f67 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1597,8 +1597,8 @@
         "encumbrance": 3,
         "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
         ],
         "specifically_covers": [ "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
       },
@@ -1606,7 +1606,7 @@
         "covers": [ "foot_l", "foot_r" ],
         "encumbrance": 2,
         "coverage": 75,
-        "material": [ { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 } ],
+        "material": [ { "type": "thermo_resin", "covered_by_mat": 100, "thickness": 1.5 } ],
         "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
       }
     ]
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 8656d76ff5c25..0cb97b49c1033 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1393,8 +1393,8 @@
         "coverage": 95,
         "covers": [ "torso" ],
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 3 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 3 }
         ]
       },
       {
@@ -1402,8 +1402,8 @@
         "encumbrance": 4,
         "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
         ],
         "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
       },
@@ -1411,8 +1411,8 @@
         "covers": [ "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ],
         "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
         ],
         "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
       },
@@ -1420,14 +1420,14 @@
         "covers": [ "foot_l", "foot_r" ],
         "encumbrance": 2,
         "coverage": 75,
-        "material": [ { "type": "thermo_resin", "covered_by_mat": 75, "thickness": 1.5 } ],
+        "material": [ { "type": "thermo_resin", "covered_by_mat": 100, "thickness": 1.5 } ],
         "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
       },
       {
         "covers": [ "leg_l", "leg_r" ],
-        "coverage": 100,
+        "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
           { "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
         ],
         "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 27b93698fc629..75ab382ec035f 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -1870,8 +1870,8 @@
         "coverage": 95,
         "covers": [ "torso" ],
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 3 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 3 }
         ]
       },
       {
@@ -1879,17 +1879,17 @@
         "encumbrance": 2,
         "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 70, "thickness": 1.5 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
         ],
         "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
       },
       {
         "covers": [ "leg_l", "leg_r" ],
-        "coverage": 100,
+        "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 95, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 15, "thickness": 1.5 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
         ],
         "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
       }

From f6e5a9f4584e4e723a84d2e1665861927cb65113 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 14:42:18 -0500
Subject: [PATCH 15/22] block while worn

---
 data/json/items/armor/arms_armor.json       | 2 +-
 data/json/items/armor/legs_armor.json       | 2 +-
 data/json/items/armor/suits_protection.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index 529adcf601c13..da81b9e6326ef 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -1656,7 +1656,7 @@
     "color": "dark_gray",
     "warmth": 20,
     "longest_side": "40 cm",
-    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED", "BLOCK_WHILE_WORN" ],
     "armor": [
       {
         "covers": [ "arm_l", "arm_r" ],
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index 554b222df2f67..9b91b4042b35a 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1590,7 +1590,7 @@
     "color": "dark_gray",
     "warmth": 20,
     "longest_side": "40 cm",
-    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED", "BLOCK_WHILE_WORN" ],
     "armor": [
       {
         "covers": [ "leg_l", "leg_r" ],
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 0cb97b49c1033..fef910effad49 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1385,7 +1385,8 @@
     "color": "dark_gray",
     "warmth": 20,
     "longest_side": "60 cm",
-    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED",
+    "BLOCK_WHILE_WORN" ],
     "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
     "armor": [
       {

From f2038a2d511d7e808f64c3b6b39a90834c4598c6 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 14:44:45 -0500
Subject: [PATCH 16/22] lint

---
 data/json/items/armor/suits_protection.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index fef910effad49..7745df13cb49a 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1385,8 +1385,7 @@
     "color": "dark_gray",
     "warmth": 20,
     "longest_side": "60 cm",
-    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED",
-    "BLOCK_WHILE_WORN" ],
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED", "BLOCK_WHILE_WORN" ],
     "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
     "armor": [
       {

From 62b8887310f48d268f13ac067814f7f66115cf26 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 16:53:52 -0500
Subject: [PATCH 17/22] updated protection values, added more padded plastic

---
 data/json/items/armor/arms_armor.json       |  6 +++---
 data/json/items/armor/legs_armor.json       |  6 +++---
 data/json/items/armor/suits_protection.json | 16 ++++++++--------
 data/json/items/armor/torso_armor.json      | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index da81b9e6326ef..a42ba859dd5f7 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -1661,10 +1661,10 @@
       {
         "covers": [ "arm_l", "arm_r" ],
         "encumbrance": 3,
-        "coverage": 95,
+        "coverage": 90,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
         ],
         "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r" ]
       }
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index 9b91b4042b35a..95f34c9eb1256 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1595,10 +1595,10 @@
       {
         "covers": [ "leg_l", "leg_r" ],
         "encumbrance": 3,
-        "coverage": 95,
+        "coverage": 90,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
         ],
         "specifically_covers": [ "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
       },
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 7745df13cb49a..e0c92c21f3679 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1393,25 +1393,25 @@
         "coverage": 95,
         "covers": [ "torso" ],
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 3 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 8 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
         ]
       },
       {
         "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
         "encumbrance": 4,
-        "coverage": 95,
+        "coverage": 90,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 95, "thickness": 2 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
         ],
         "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
       },
       {
         "covers": [ "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ],
-        "coverage": 95,
+        "coverage": 85,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
           { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
         ],
         "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
@@ -1427,7 +1427,7 @@
         "covers": [ "leg_l", "leg_r" ],
         "coverage": 95,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
           { "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
         ],
         "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 75ab382ec035f..9aa5f7ec3cff3 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -1870,25 +1870,25 @@
         "coverage": 95,
         "covers": [ "torso" ],
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
-          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 3 }
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 8 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
         ]
       },
       {
         "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
         "encumbrance": 2,
-        "coverage": 95,
+        "coverage": 85,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
           { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
         ],
         "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
       },
       {
         "covers": [ "leg_l", "leg_r" ],
-        "coverage": 95,
+        "coverage": 100,
         "material": [
-          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
           { "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
         ],
         "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]

From e4bb10128f421a3f8065b0c1499f87ebd7c7a774 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 2 Nov 2022 18:01:40 -0500
Subject: [PATCH 18/22] price

---
 data/json/items/armor/arms_armor.json       | 2 +-
 data/json/items/armor/legs_armor.json       | 2 +-
 data/json/items/armor/suits_protection.json | 2 +-
 data/json/items/armor/torso_armor.json      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index a42ba859dd5f7..f99c2db69a1cf 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -1648,7 +1648,7 @@
     "weight": "500 g",
     "volume": "2500 ml",
     "price": 10000,
-    "price_postapoc": 500,
+    "price_postapoc": 750,
     "to_hit": -3,
     "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index 95f34c9eb1256..71d02a9a042ed 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1582,7 +1582,7 @@
     "weight": "500 g",
     "volume": "2500 ml",
     "price": 10000,
-    "price_postapoc": 500,
+    "price_postapoc": 750,
     "to_hit": -3,
     "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index e0c92c21f3679..231de3dccdb53 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -1377,7 +1377,7 @@
     "weight": "3 kg",
     "volume": "12500 ml",
     "price": 60000,
-    "price_postapoc": 3000,
+    "price_postapoc": 4000,
     "to_hit": -3,
     "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 9aa5f7ec3cff3..ff982de306420 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -1854,7 +1854,7 @@
     "weight": "2 kg",
     "volume": "10000 ml",
     "price": 40000,
-    "price_postapoc": 2000,
+    "price_postapoc": 2500,
     "to_hit": -3,
     "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",

From 577de0ccb725c69bf6a269eb9b4b319d92a7fa91 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Tue, 8 Nov 2022 00:50:59 -0600
Subject: [PATCH 19/22] lint

---
 data/json/recipes/recipe_deconstruction.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
index f65c951091e70..1b8bad6c20c9c 100644
--- a/data/json/recipes/recipe_deconstruction.json
+++ b/data/json/recipes/recipe_deconstruction.json
@@ -7170,7 +7170,8 @@
     "activity_level": "LIGHT_EXERCISE",
     "time": "1 m",
     "components": [ [ [ "armor_riot_leg", 1 ] ], [ [ "armor_riot_arm", 1 ] ], [ [ "armor_riot_torso", 1 ] ] ]
-   },
+  },
+  {
     "result": "matches",
     "type": "uncraft",
     "activity_level": "NO_EXERCISE",

From 49c0e4e59c5c3f9d27feb990fd4f799bcf50645d Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Tue, 8 Nov 2022 00:56:47 -0600
Subject: [PATCH 20/22] mon drops

---
 data/json/monsterdrops/zombie_cop.json | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json
index c479494b7c28e..1c88c3fbf7f88 100644
--- a/data/json/monsterdrops/zombie_cop.json
+++ b/data/json/monsterdrops/zombie_cop.json
@@ -35,8 +35,11 @@
     "type": "item_group",
     "id": "cop_armor",
     "items": [
-      [ "armor_riot", 20 ],
-      [ "kevlar", 35 ],
+      [ "armor_riot", 25 ],
+      [ "armor_riot_arm", 5 ],
+      [ "armor_riot_leg", 5 ],
+      [ "armor_riot_torso", 10 ],
+      [ "kevlar", 45 ],
       {
         "item": "level_3_vest",
         "variant": "police_armor_vest",
@@ -270,7 +273,14 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "distribution": [ { "item": "armor_riot", "prob": 25 }, { "group": "swat_ballistic_vest", "prob": 75 } ], "prob": 65 },
+      {
+        "distribution": [
+          { "item": "armor_riot", "prob": 30 },
+          { "item": "armor_riot_torso", "prob": 10 },
+          { "group": "swat_ballistic_vest", "prob": 80 }
+        ],
+        "prob": 65
+      },
       {
         "distribution": [
           { "item": "tank_top", "prob": 30 },

From 2eb328460eabf2d2d514caa0f98408bf3ad336c9 Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Tue, 8 Nov 2022 01:02:05 -0600
Subject: [PATCH 21/22] drop chances

---
 data/json/monsterdrops/zombie_cop.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json
index 1c88c3fbf7f88..eda3de68d02bf 100644
--- a/data/json/monsterdrops/zombie_cop.json
+++ b/data/json/monsterdrops/zombie_cop.json
@@ -35,11 +35,11 @@
     "type": "item_group",
     "id": "cop_armor",
     "items": [
-      [ "armor_riot", 25 ],
+      [ "armor_riot", 65 ],
       [ "armor_riot_arm", 5 ],
       [ "armor_riot_leg", 5 ],
       [ "armor_riot_torso", 10 ],
-      [ "kevlar", 45 ],
+      [ "kevlar", 100 ],
       {
         "item": "level_3_vest",
         "variant": "police_armor_vest",
@@ -276,7 +276,7 @@
       {
         "distribution": [
           { "item": "armor_riot", "prob": 30 },
-          { "item": "armor_riot_torso", "prob": 10 },
+          { "item": "armor_riot_torso", "prob": 15 },
           { "group": "swat_ballistic_vest", "prob": 80 }
         ],
         "prob": 65

From 6721e7f67be6593f2ef24bb8232d5a14b11a2b7a Mon Sep 17 00:00:00 2001
From: bean-b <bbaumsta@macalester.edu>
Date: Wed, 16 Nov 2022 01:10:34 -0600
Subject: [PATCH 22/22] lint of merge into master

---
 data/json/items/armor/legs_armor.json  | 4 ++--
 data/json/items/armor/torso_armor.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index 5e8048bd9828b..b673766a0ed95 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -1610,8 +1610,8 @@
         "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
       }
     ]
-   },
-   {
+  },
+  {
     "id": "legguard_larmor",
     "type": "ARMOR",
     "category": "armor",
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 2149c9c37bc77..32ff42f2585eb 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -1973,8 +1973,8 @@
         "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
       }
     ]
-   },
-   {
+  },
+  {
     "id": "armor_larmor_chest",
     "type": "ARMOR",
     "category": "armor",