PASGT and better helmets

data/json/itemgroups/clothing.json

@@ -2195,7 +2195,8 @@
       [ "jacket_leather", 12 ],
       [ "jacket_jean", 8 ],
       [ "jacket_flannel", 6 ],
-      [ "cuirass_scrap", 12 ]
+      [ "cuirass_scrap", 12 ],
+      [ "pasgt_vest", 1 ]
     ]
   },
   {
@@ -2282,7 +2283,8 @@
       [ "helmet_plate", 1 ],
       [ "helmet_scrap", 12 ],
       [ "survivor_goggles", 10 ],
-      [ "hood_rain", 14 ]
+      [ "hood_rain", 14 ],
+      [ "pasgt_helmet", 1 ]
     ]
   },
   {

data/json/itemgroups/item_groups.json

@@ -733,6 +733,8 @@
       [ "eclipse_glasses", 1 ],
       [ "bodypillow", 2 ],
       [ "reading_light", 8 ],
+      [ "pasgt_vest", 1 ],
+      [ "pasgt_helmet", 1 ],
       { "item": "condom", "prob": 50, "count": [ 1, 5 ] }
     ]
   },
@@ -1367,7 +1369,8 @@
       [ "briefcase", 5 ],
       [ "survnote", 2 ],
       [ "robot_controls", 3 ],
-      [ "solarpack", 1 ]
+      [ "solarpack", 1 ],
+      [ "pasgt_helmet", 1 ]
     ]
   },
   {

data/json/itemgroups/locations.json

@@ -44,7 +44,8 @@
       [ "l_dsr_223_kit", 5 ],
       [ "l_lmg_223_kit", 5 ],
       [ "l_mbr_223_kit", 5 ],
-      [ "survnote", 1 ]
+      [ "survnote", 1 ],
+	  [ "pasgt_helmet", 1 ]
     ]
   },
   {

data/json/itemgroups/locations_commercial.json

@@ -593,6 +593,8 @@
       [ "bronze_medal", 3 ],
       [ "silver_medal", 2 ],
       [ "gold_medal", 1 ],
+	  [ "pasgt_vest", 1],
+	  [ "pasgt_helmet", 1],
       { "group": "tinware", "prob": 10 }
     ]
   },
@@ -705,7 +707,9 @@
       [ "chem_hexamine", 5 ],
       [ "esbit_stove", 10 ],
       [ "mess_tin", 10 ],
-      [ "angle_grinder", 4 ]
+      [ "angle_grinder", 4 ],
+	  [ "pasgt_vest", 1 ],
+	  [ "pasgt_helmet", 1 ]
     ]
   },
   {

data/json/items/armor/ballistic_armor.json

@@ -85,5 +85,35 @@
     "warmth": 10,
     "material_thickness": 2,
     "flags": [ "STURDY", "OUTER" ]
+  },
+  {
+    "id": "pasgt_vest",
+    "type": "ARMOR",
+    "name": "PASGT vest",
+    "description": "An old military surplus flak vest with a woodland camouflage from the early 80's made of kevlar and nylon.  The vest is meant to stop shrapnel from small explosives like grenades, but may stop a 9mm.  Though later replaced by better armor models, these are still in use by foreign militaries.",
+    "weight": "4082 g",
+    "volume": "3 L",
+    "price": 2000,
+    "to_hit": -1,
+    "material": [ "nylon", "kevlar" ],
+    "symbol": "[",
+    "looks_like": "vest_leather",
+    "color": "green",
+    "covers": [ "TORSO" ],
+    "coverage": 100,
+    "encumbrance": 20,
+    "storage": "500 ml",
+    "warmth": 20,
+    "material_thickness": 2,
+    "environmental_protection": 1,
+    "flags": [ "OUTER", "WATER_FRIENDLY" ],
+	"use_action": 
+      "type": "holster",
+      "holster_prompt": "Stash grenades",
+      "holster_msg": "You stash your %s.",
+      "multi": 2,
+      "max_volume": "750 ml",
+      "draw_cost": 30,
+      "flags": [ "GRENADE" ]
   }
 ]

data/json/items/armor/helmets.json

@@ -48,14 +48,14 @@
     "repairs_like": "xlkevlar",
     "type": "ARMOR",
     "category": "armor",
-    "name": "army helmet",
+    "name": "ACH Helmet",
     "description": "A heavy helmet that provides excellent protection from all sorts of damage.  It is labeled as the advanced combat helmet.",
     "weight": "1383 g",
     "volume": "1750 ml",
     "price": 15000,
     "to_hit": -1,
     "bashing": 10,
-    "material": [ "kevlar", "plastic" ],
+    "material": [ "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "hat_hard",
     "color": "green",
@@ -65,7 +65,7 @@
     "warmth": 20,
     "material_thickness": 9,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+    "flags": [ "NO_REPAIR", "WATERPROOF", "STURDY" ]
   },
   {
     "id": "tac_fullhelmet",
@@ -79,7 +79,7 @@
     "price": 50000,
     "to_hit": -1,
     "bashing": 10,
-    "material": [ "kevlar", "plastic" ],
+    "material": [ "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "helmet_motor",
     "color": "dark_gray",
@@ -90,7 +90,7 @@
     "material_thickness": 5,
     "environmental_protection": 2,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES" ]
+    "flags": [ "NO_REPAIR", "STURDY", "SUN_GLASSES" ]
   },
   {
     "id": "tac_helmet",
@@ -104,7 +104,7 @@
     "price": 37000,
     "to_hit": -1,
     "bashing": 10,
-    "material": [ "kevlar", "plastic" ],
+    "material": [ "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "tac_fullhelmet",
     "color": "dark_gray",
@@ -114,7 +114,7 @@
     "warmth": 10,
     "material_thickness": 4,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "WATER_FRIENDLY", "STURDY" ]
+    "flags": [ "NO_REPAIR", "WATER_FRIENDLY", "STURDY" ]
   },
   {
     "id": "firehelmet",
@@ -622,5 +622,18 @@
     "material_thickness": 2,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "OVERSIZE" ]
+  },
+  {
+    "id": "pasgt_helmet",
+    "copy-from": "helmet_army",
+    "type": "ARMOR",
+    "name": "PASGT helmet",
+    "description": "An older helmet from the early 80's made of 19 layers of kevlar and treated with phenolic resin.  The helmet was designed to protect the wearer from shrapnel, but may still stop a 9mm.  Though later replaced by better armor models, these are still in use by foreign militaries.",
+    "symbol": "[",
+    "color": "green",
+    "weight": "1633 g",
+    "material": [ "kevlar_rigid" ],
+    "material_thickness": 8,
+    "flags": [ "WATERPROOF", "STURDY" ]
   }
 ]