16 files changed, 895 insertions, 0 deletions
diff --git a/json/items/armor/ammo_pouch.json b/json/items/armor/ammo_pouch.json
new file mode 100644
index 0000000..eb19d7d
--- /dev/null
+++ b/json/items/armor/ammo_pouch.json
@@ -0,0 +1,46 @@
+[
+  {
+    "id": "ammo_pouch",
+    "copy-from": "ammo_pouch",
+    "type": "ARMOR",
+    "name": { "str": "ammo satchel" },
+    "rigid": false,
+    "encumbrance": 1,
+    "max_encumbrance": 5
+  },
+  {
+    "id": "legpouch_large",
+    "copy-from": "legpouch_large",
+    "type": "ARMOR",
+    "name": { "str": "leg magazine pouch", "str_pl": "leg magazine pouch" },
+    "extend": { "flags": [ "COMPACT" ] }
+  },
+  {
+    "id": "ammo_satchel",
+    "copy-from": "ammo_satchel",
+    "type": "ARMOR",
+    "name": { "str": "magazine satchel" },
+    "rigid": false,
+    "encumbrance": 1,
+    "max_encumbrance": 2
+  },
+  {
+    "id": "tacvest",
+    "copy-from": "tacvest",
+    "type": "ARMOR",
+    "name": { "str": "tac vest" },
+    "encumbrance": 2,
+    "max_encumbrance": 5,
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash ammo",
+      "holster_msg": "You stash your %s.",
+      "multi": 5,
+      "min_volume": "250 ml",
+      "max_volume": "1 L",
+      "draw_cost": 60,
+      "flags": [ "MAG_COMPACT", "MAG_BULKY" ]
+    },
+    "//": "Increase the magazine capacity to five."
+  }
+]
diff --git a/json/items/armor/arms_armor.json b/json/items/armor/arms_armor.json
new file mode 100644
index 0000000..c76be5d
--- /dev/null
+++ b/json/items/armor/arms_armor.json
@@ -0,0 +1,53 @@
+[
+  {
+    "id": "elbow_pads",
+    "copy-from": "elbow_pads",
+    "type": "ARMOR",
+    "name": { "str": "pair of elbow pads", "str_pl": "pairs of elbow pads" },
+    "extend": { "flags": [ "COMPACT", "ONLY_ONE" ] },
+    "//": "Add the ONLY_ONE flag to prevent stacking this 0 encumbrance item."
+  },
+  {
+    "id": "armguard_hard",
+    "copy-from": "armguard_hard",
+    "type": "ARMOR",
+    "name": { "str": "pair of hard arm guards", "str_pl": "pairs of hard arm guards" },
+    "coverage": 90,
+    "encumbrance": 5,
+    "extend": { "flags": [ "STURDY" ] }
+  },
+  {
+    "id": "armguard_larmor",
+    "copy-from": "armguard_larmor",
+    "type": "ARMOR",
+    "name": { "str": "pair of leather arm guards", "str_pl": "pairs of leather arm guards" },
+    "weight": "730 g",
+    "coverage": 95,
+    "encumbrance": 5,
+    "delete": { "flags": [ "VARSIZE" ] }
+  },
+  {
+    "id": "armguard_lightplate",
+    "copy-from": "armguard_lightplate",
+    "type": "ARMOR",
+    "name": { "str": "pair of steel arm guards", "str_pl": "pairs of steel arm guards" },
+    "encumbrance": 15
+  },
+  {
+    "id": "armguard_chitin",
+    "copy-from": "armguard_chitin",
+    "type": "ARMOR",
+    "name": { "str": "pair of chitin arm guards", "str_pl": "pairs of chitin arm guards" },
+    "coverage": 90,
+    "encumbrance": 4,
+    "material_thickness": 3
+  },
+  {
+    "id": "armguard_acidchitin",
+    "copy-from": "armguard_acidchitin",
+    "type": "ARMOR",
+    "name": { "str": "pair of biosilicified chitin arm guards", "str_pl": "pairs of biosilicified chitin arm guards" },
+    "material_thickness": 4,
+    "extend": { "flags": [ "NO_REPAIR" ] }
+  }
+]
diff --git a/json/items/armor/bandolier.json b/json/items/armor/bandolier.json
new file mode 100644
index 0000000..b2fbf4c
--- /dev/null
+++ b/json/items/armor/bandolier.json
@@ -0,0 +1,47 @@
+[
+  {
+    "id": "grenade_pouch",
+    "copy-from": "grenade_pouch",
+    "type": "ARMOR",
+    "name": { "str": "grenade cartridge pouch", "str_pl": "grenade cartridge pouches" },
+    "rigid": true,
+    "encumbrance": 0,
+    "max_encumbrance": 2,
+    "use_action": { "type": "bandolier", "capacity": 4, "ammo": [ "40x46mm", "40x53mm" ], "draw_cost": 20 },
+    "//": "Rename to grenade cartridge pouch",
+    "//2": "Reduce the storage capacity back down to 4.",
+    "//3": "Reduce the encumbrance."
+  },
+  {
+    "id": "grenadebandolier",
+    "type": "ARMOR",
+    "name": { "str": "hand grenade pouch", "str_pl": "hand grenade pouches" },
+    "description": "A pouch for holding up to four full-sized grenades of various types.",
+    "weight": "600 g",
+    "volume": "1250 ml",
+    "price": "30 USD",
+    "price_postapoc": "1250 cent",
+    "rigid": false,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "leather_belt",
+    "color": "dark_gray",
+    "covers": [ "torso" ],
+    "coverage": 15,
+    "material_thickness": 2,
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash grenades",
+      "holster_msg": "You stash your %s.",
+      "multi": 4,
+      "min_volume": "0 ml",
+      "max_volume": "1 L",
+      "draw_cost": 30,
+      "flags": [ "GRENADE" ]
+    },
+    "valid_mods": [ "resized_large" ],
+    "flags": [ "WATER_FRIENDLY", "BELTED", "COMPACT" ],
+    "//": "I don't agree with making this a leg pouch. Revert to torso. And overwrite to prevent it sometimes being sided.",
+    "//2": "Also reduce the minimum stored item volume to facilitate items with less lazily rounded volumes."
+  }
+]
diff --git a/json/items/armor/boots.json b/json/items/armor/boots.json
new file mode 100644
index 0000000..8dc3d89
--- /dev/null
+++ b/json/items/armor/boots.json
@@ -0,0 +1,39 @@
+[
+  {
+    "id": "stockings",
+    "type": "ARMOR",
+    "name": { "str": "pair of stockings", "str_pl": "pairs of stockings" },
+    "description": "Long cotton socks that reach above the knees to help protect from the cold.",
+    "weight": "90 g",
+    "volume": "250 ml",
+    "price": "5 USD",
+    "price_postapoc": "250 cent",
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "leg_warmers",
+    "color": "dark_gray",
+    "armor_portion_data": [
+      { "covers": [ "legs" ], "coverage": 75, "encumbrance": 5 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 5 }
+    ],
+    "warmth": 10,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+  },
+  {
+    "id": "boots_combat",
+    "copy-from": "boots_combat",
+    "type": "ARMOR",
+    "name": { "str": "pair of combat boots", "str_pl": "pairs of combat boots" },
+    "encumbrance": 12,
+    "//": "Add the mising 'pair of' to the name.",
+    "//2": "Reduce the encumbrance."
+  },
+  { 
+    "id": "sandal_armor",
+    "copy-from": "sandal_armor",
+    "type": "ARMOR",
+    "name": { "str": "pair of armored sandals", "str_pl": "pairs of armored sandals" },
+    "//": "Add the mising 'pair of' to the name."
+  }
+]
diff --git a/json/items/armor/coats.json b/json/items/armor/coats.json
new file mode 100644
index 0000000..9b4bcd6
--- /dev/null
+++ b/json/items/armor/coats.json
@@ -0,0 +1,137 @@
+[
+  {
+    "id": "greatcoat",
+    "copy-from": "greatcoat",
+    "type": "ARMOR",
+    "name": { "str": "greatcoat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 11, 20 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 11, 11 ] },
+      { "covers": [ "legs" ], "coverage": 79, "encumbrance": [ 11, 13 ] }
+    ]
+  },
+  {
+    "id": "jacket_leather",
+    "copy-from": "jacket_leather",
+    "type": "ARMOR",
+    "name": { "str": "leather jacket" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 10, 15 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 10, 10 ] }
+    ],
+    "storage": "1600 ml"
+  },
+  {
+    "id": "trenchcoat",
+    "copy-from": "trenchcoat",
+    "type": "ARMOR",
+    "name": { "str": "trenchcoat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ]
+  },
+  {
+    "id": "trenchcoat_leather",
+    "copy-from": "trenchcoat_leather",
+    "type": "ARMOR",
+    "name": { "str": "leather trenchcoat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 17 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] }
+    ]
+  },
+  {
+    "id": "trenchcoat_survivor",
+    "copy-from": "trenchcoat_survivor",
+    "type": "ARMOR",
+    "name": { "str": "survivor trenchcoat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 15 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] }
+    ],
+    "material_thickness": 4,
+    "storage": "8600 ml"
+  },
+  {
+    "id": "coat_winter",
+    "copy-from": "coat_winter",
+    "type": "ARMOR",
+    "name": { "str": "winter coat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 18, 27 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 18, 21 ] }
+    ],
+    "storage": "4 L"
+  },
+  {
+    "id": "duster",
+    "copy-from": "duster",
+    "type": "ARMOR",
+    "name": { "str": "duster" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] }
+    ],
+    "storage": "6600 ml"
+  },
+  {
+    "id": "duster_leather",
+    "copy-from": "duster_leather",
+    "type": "ARMOR",
+    "name": { "str": "leather duster" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] }
+    ],
+    "storage": "6600 ml"
+  },
+  {
+    "id": "duster_survivor",
+    "copy-from": "duster_survivor",
+    "type": "ARMOR",
+    "name": { "str": "survivor duster" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 13 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 5, 6 ] }
+    ],
+    "material_thickness": 4,
+    "storage": "8600 ml"
+  },
+  {
+    "id": "jacket_army",
+    "copy-from": "jacket_army",
+    "type": "ARMOR",
+    "name": { "str": "army jacket" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ],
+    "storage": "5 L"
+  },
+  {
+    "id": "winter_jacket_army",
+    "copy-from": "winter_jacket_army",
+    "type": "ARMOR",
+    "name": { "str": "army winter jacket" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 10, 20 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 10, 10 ] }
+    ],
+    "storage": "5 L"
+  },
+  {
+    "id": "coat_lab",
+    "copy-from": "coat_lab",
+    "type": "ARMOR",
+    "name": { "str": "lab coat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 2, 5 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 2, 2 ] }
+    ],
+    "storage": "4 L"
+  }
+]
diff --git a/json/items/armor/gloves.json b/json/items/armor/gloves.json
new file mode 100644
index 0000000..5d96658
--- /dev/null
+++ b/json/items/armor/gloves.json
@@ -0,0 +1,10 @@
+[
+  {
+    "id": "gloves_survivor_fingerless",
+    "copy-from": "gloves_survivor_fingerless",
+    "type": "ARMOR",
+    "name": { "str": "pair of fingerless survivor gloves", "str_pl": "pairs of fingerless survivor gloves" },
+    "encumbrance": 2,
+    "//": "Reduce the encumbrance to be more comparable to the difference between leather and fingerless leather gloves."
+  }
+]
diff --git a/json/items/armor/helmets.json b/json/items/armor/helmets.json
new file mode 100644
index 0000000..a5f8e36
--- /dev/null
+++ b/json/items/armor/helmets.json
@@ -0,0 +1,144 @@
+[
+  {
+    "id": "helmet_lsurvivor",
+    "type": "ARMOR",
+    "name": { "str": "light survivor helmet" },
+    "//": "Roughly an improved tactical helmet.",
+    "description": "A customized, heavily armored Kevlar helmet, modified with cotton reinforcements to provide maximum comfort and protection from harm. All the added material has kept it rather light.",
+    "weight": "910 g",
+    "volume": "1750 ml",
+    "price": "0 cent",
+    "price_postapoc": "30 USD",
+    "to_hit": -1,
+    "bashing": 10,
+    "material": [ "kevlar_rigid", "cotton" ],
+    "symbol": "[",
+    "looks_like": "helmet_survivor",
+    "color": "dark_gray",
+    "covers": [ "head" ],
+    "coverage": 100,
+    "encumbrance": 15,
+    "warmth": 15,
+    "material_thickness": 9,
+    "environmental_protection": 3,
+    "techniques": [ "WBLOCK_1" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "//": "Overwrite because I disagree with BN's balancing."
+  },
+  {
+    "id": "helmet_survivor",
+    "type": "ARMOR",
+    "name": { "str": "survivor helmet" },
+    "//": "Roughly an improved army helmet.",
+    "description": "A customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
+    "weight": "1420 g",
+    "volume": "2000 ml",
+    "price": "0 cent",
+    "price_postapoc": "40 USD",
+    "to_hit": -1,
+    "bashing": 10,
+    "material": [ "kevlar_rigid", "leather" ],
+    "symbol": "[",
+    "looks_like": "helmet_army",
+    "color": "dark_gray",
+    "covers": [ "head" ],
+    "coverage": 100,
+    "encumbrance": 30,
+    "warmth": 15,
+    "material_thickness": 9,
+    "environmental_protection": 3,
+    "techniques": [ "WBLOCK_1" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "//": "Overwrite because I disagree with BN's balancing."
+  },
+  {
+    "id": "helmet_hsurvivor",
+    "type": "ARMOR",
+    "name": { "str": "heavy survivor helmet" },
+    "//": "A furthur improved army helmet. But still greatly inferior to a light power armor helmet.",
+    "description": "A customized, heavily armored steel and Kevlar helmet, modified to provide maximum comfort and protection from harm.  All the added material has made it rather heavy.",
+    "weight": "3312 g",
+    "volume": "2500 ml",
+    "price": "0 cent",
+    "price_postapoc": "60 USD",
+    "to_hit": -1,
+    "bashing": 10,
+    "material": [ "kevlar_rigid", "steel" ],
+    "symbol": "[",
+    "looks_like": "helmet_survivor",
+    "color": "dark_gray",
+    "covers": [ "head" ],
+    "coverage": 100,
+    "encumbrance": 40,
+    "warmth": 15,
+    "material_thickness": 8,
+    "environmental_protection": 5,
+    "techniques": [ "WBLOCK_1" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "//": "Overwrite because I disagree with BN's balancing."
+  },
+  {
+    "id": "helmet_sasurvivor",
+    "type": "ARMOR",
+    "name": { "str": "superalloy survivor helmet" },
+    "description": "A customized, heavily armored superalloy and Kevlar helmet, modified to provide maximum comfort and protection from harm.  All the added material has made it rather heavy.",
+    "weight": "2649 g",
+    "volume": "2500 ml",
+    "price": "0 cent",
+    "price_postapoc": "65 USD",
+    "to_hit": -1,
+    "bashing": 10,
+    "material": [ "kevlar_rigid", "superalloy" ],
+    "symbol": "[",
+    "looks_like": "helmet_survivor",
+    "color": "light_cyan",
+    "covers": [ "head" ],
+    "coverage": 100,
+    "encumbrance": 35,
+    "warmth": 15,
+    "material_thickness": 8,
+    "environmental_protection": 5,
+    "techniques": [ "WBLOCK_1" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "//": "Overwrite because I disagree with BN's balancing."
+  },
+
+  {
+    "id": "helmet_army",
+    "copy-from": "helmet_army",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "army helmet" },
+    "material": [ "kevlar_rigid", "plastic" ],
+    "//": "Fix the material from kevlar to rigid kevlar."
+  },
+  {
+    "id": "tac_helmet",
+    "copy-from": "tac_helmet",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "tactical helmet" },
+    "material": [ "kevlar_rigid", "plastic" ],
+    "material_thickness": 8,
+    "//": "Fix the material from kevlar to rigid kevlar.",
+    "//2": "Also buff the thickness to make it a viable option compared to the army helmet."
+  },
+  {
+    "id": "tac_fullhelmet",
+    "copy-from": "tac_fullhelmet",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "tactical full helmet" },
+    "material": [ "kevlar_rigid", "plastic" ],
+    "material_thickness": 8,
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 20 },
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 20 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 15 }
+    ],
+    "extend": { "flags": [ "WATERPROOF" ] },
+    "//": "Fix the material from kevlar to rigid kevlar.",
+    "//2": "Also buff the thickness to make it a viable option compared to the army helmet.",
+    "//3": "Also add WATERPROOF"
+  }
+]
diff --git a/json/items/armor/holster.json b/json/items/armor/holster.json
new file mode 100644
index 0000000..0cd2011
--- /dev/null
+++ b/json/items/armor/holster.json
@@ -0,0 +1,23 @@
+[
+  {
+    "id": "XL_holster",
+    "copy-from": "XL_holster",
+    "type": "ARMOR",
+    "name": { "str": "large holster" },
+    "rigid": false,
+    "encumbrance": 1,
+    "max_encumbrance": 4,
+    "//": "Reduce the encumbrance when empty."
+  },
+  {
+    "id": "survivor_vest",
+    "copy-from": "survivor_vest",
+    "type": "ARMOR",
+    "name": { "str": "survivor harness" },
+    "rigid": false,
+    "storage": "4500 ml",
+    "encumbrance": 1,
+    "max_encumbrance": 4,
+    "//": "Reduce the encumbrance when empty."
+  }
+]
diff --git a/json/items/armor/hoods.json b/json/items/armor/hoods.json
new file mode 100644
index 0000000..ebc36be
--- /dev/null
+++ b/json/items/armor/hoods.json
@@ -0,0 +1,51 @@
+[
+  {
+    "id": "hood_lsurvivor",
+    "type": "ARMOR",
+    "name": { "str": "light survivor hood" },
+    "description": "A customized armored cloth and Kevlar hood, very light and durable.",
+    "weight": "628 g",
+    "volume": "750 ml",
+    "price": "0 cent",
+    "price_postapoc": "30 USD",
+    "to_hit": -1,
+    "bashing": 10,
+    "material": [ "kevlar", "cotton" ],
+    "symbol": "[",
+    "looks_like": "hood_survivor",
+    "color": "green",
+    "covers": [ "head" ],
+    "coverage": 100,
+    "encumbrance": 15,
+    "warmth": 15,
+    "material_thickness": 4,
+    "environmental_protection": 3,
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ],
+    "//": "Overwrite because I disagree with BN's balancing."
+  },
+  {
+    "id": "hood_survivor",
+    "type": "ARMOR",
+    "name": { "str": "survivor hood" },
+    "description": "A customized, heavily armored leather and Kevlar hood, designed to provide comfort and protection from harm.",
+    "weight": "820 g",
+    "volume": "2 L",
+    "price": "0 cent",
+    "price_postapoc": "40 USD",
+    "to_hit": -1,
+    "bashing": 10,
+    "material": [ "kevlar", "leather" ],
+    "symbol": "[",
+    "looks_like": "hood_rain",
+    "color": "brown",
+    "covers": [ "head" ],
+    "coverage": 100,
+    "encumbrance": 25,
+    "warmth": 15,
+    "material_thickness": 4,
+    "environmental_protection": 3,
+    "techniques": [ "WBLOCK_1" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ],
+    "//": "Overwrite because I disagree with BN's balancing."
+  }
+]
diff --git a/json/items/armor/legs_armor.json b/json/items/armor/legs_armor.json
new file mode 100644
index 0000000..6a4a72a
--- /dev/null
+++ b/json/items/armor/legs_armor.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "knee_pads",
+    "copy-from": "knee_pads",
+    "type": "ARMOR",
+    "name": { "str": "pair of knee pads", "str_pl": "pairs of knee pads" },
+    "extend": { "flags": [ "COMPACT", "ONLY_ONE" ] },
+    "//": "Add the ONLY_ONE flag to prevent stacking this 0 encumbrance item."
+  },
+  {
+    "id": "legguard_hard",
+    "copy-from": "legguard_hard",
+    "type": "ARMOR",
+    "name": { "str": "pair of hard leg guards", "str_pl": "pairs of hard leg guards" },
+    "coverage": 90,
+    "encumbrance": 4,
+    "extend": { "flags": [ "STURDY" ] }
+  },
+  {
+    "id": "lsurvivor_pants",
+    "copy-from": "lsurvivor_pants",
+    "type": "ARMOR",
+    "name": { "str_sp": "light survivor cargo pants" },
+    "coverage": 100,
+    "material_thickness": 4,
+    "storage": "4600 ml",
+    "encumbrance": 8,
+    "max_encumbrance": 16
+  },
+  {
+    "id": "pants_survivor",
+    "copy-from": "pants_survivor",
+    "type": "ARMOR",
+    "name": { "str_sp": "survivor cargo pants" },
+    "material_thickness": 5,
+    "storage": "7100 ml",
+    "encumbrance": 10,
+    "max_encumbrance": 20,
+    "extend": { "flags": [ "RAINPROOF" ] }
+  }
+]
diff --git a/json/items/armor/legs_clothes.json b/json/items/armor/legs_clothes.json
new file mode 100644
index 0000000..5b36a25
--- /dev/null
+++ b/json/items/armor/legs_clothes.json
@@ -0,0 +1,58 @@
+[
+  { 
+    "id": "pants",
+    "copy-from": "pants",
+    "type": "ARMOR",
+    "name": { "str_sp": "pants" },
+    "encumbrance": 7,
+    "max_encumbrance": 11,
+    "storage": "4500 ml"
+  },
+  { 
+    "id": "jeans",
+    "copy-from": "jeans",
+    "type": "ARMOR",
+    "name": { "str_sp": "jeans" },
+    "description": "A pair of blue jeans with four deep pockets.",
+    "encumbrance": 7,
+    "max_encumbrance": 11,
+    "storage": "4500 ml"
+  },
+  { 
+    "id": "pants_leather",
+    "copy-from": "pants_leather",
+    "type": "ARMOR",
+    "name": { "str_sp": "leather pants" },
+    "encumbrance": 15,
+    "max_encumbrance": 17,
+    "storage": "1600 ml"
+  },
+  { 
+    "id": "pants_army",
+    "copy-from": "pants_army",
+    "type": "ARMOR",
+    "name": { "str_sp": "army pants" },
+    "encumbrance": 3,
+    "max_encumbrance": 7,
+    "storage": "7 L"
+  },
+  { 
+    "id": "winter_pants_army",
+    "copy-from": "winter_pants_army",
+    "type": "ARMOR",
+    "name": { "str_sp": "army winter pants" },
+    "encumbrance": 11,
+    "max_encumbrance": 22,
+    "storage": "7 L"
+  },
+  { 
+    "id": "pants_cargo",
+    "copy-from": "pants_cargo",
+    "type": "ARMOR",
+    "name": { "str_sp": "cargo pants" },
+    "encumbrance": 2,
+    "max_encumbrance": 6,
+    "storage": "7 L",
+    "coverage": 100
+  }
+]
diff --git a/json/items/armor/masks.json b/json/items/armor/masks.json
new file mode 100644
index 0000000..6a3ab21
--- /dev/null
+++ b/json/items/armor/masks.json
@@ -0,0 +1,9 @@
+[
+  {
+    "id": "mask_bal",
+    "copy-from": "mask_bal",
+    "type": "ARMOR",
+    "name": { "str": "ballistic mask" },
+    "coverage": 100
+  }
+]
diff --git a/json/items/armor/storage.json b/json/items/armor/storage.json
new file mode 100644
index 0000000..938b644
--- /dev/null
+++ b/json/items/armor/storage.json
@@ -0,0 +1,121 @@
+[
+  { 
+    "id": "mbag",
+    "copy-from": "mbag",
+    "type": "ARMOR",
+    "name": { "str": "messenger bag" },
+    "encumbrance": 4,
+    "max_encumbrance": 8,
+    "storage": "15 L",
+    "flags": [ "BELTED", "WATER_FRIENDLY" ]
+  },
+  { 
+    "id": "backpack",
+    "copy-from": "backpack",
+    "type": "ARMOR",
+    "name": { "str": "backpack" },
+    "encumbrance": 4,
+    "max_encumbrance": 19,
+    "storage": "35500 ml"
+  },
+  { 
+    "id": "backpack_leather",
+    "copy-from": "backpack_leather",
+    "type": "ARMOR",
+    "name": { "str": "leather backpack" },
+    "encumbrance": 2,
+    "max_encumbrance": 25,
+    "storage": "35500 ml"
+  },
+  { 
+    "id": "duffelbag",
+    "copy-from": "duffelbag",
+    "type": "ARMOR",
+    "name": { "str": "duffel bag" },
+    "encumbrance": 5,
+    "max_encumbrance": 15,
+    "storage": "39 L"
+  },
+  { 
+    "id": "molle_pack",
+    "copy-from": "molle_pack",
+    "type": "ARMOR",
+    "name": { "str": "MOLLE pack" },
+    "weight": "1450 g",
+    "volume": "6 L",
+    "encumbrance": 5,
+    "max_encumbrance": 11,
+    "storage": "38 L"
+  },
+  { 
+    "id": "backpack_tactical_large",
+    "copy-from": "backpack_tactical_large",
+    "type": "ARMOR",
+    "name": { "str": "large tactical backpack" },
+    "encumbrance": 10,
+    "max_encumbrance": 55,
+    "storage": "81 L"
+  },
+  { 
+    "id": "legrig",
+    "copy-from": "legrig",
+    "type": "ARMOR",
+    "name": { "str": "pair of drop leg pouches", "str_pl": "pairs of drop leg pouches" },
+    "storage": "5 L",
+    "encumbrance": 2,
+    "max_encumbrance": 3,
+    "flags": [ "WATER_FRIENDLY", "BELTED" ],
+    "//": "Changed to strapped layer since knee pads no longer hard conflict."
+  },
+  { 
+    "id": "daypack",
+    "copy-from": "daypack",
+    "type": "ARMOR",
+    "name": { "str": "daypack" },
+    "storage": "39 L",
+    "encumbrance": 2,
+    "max_encumbrance": 18
+  },
+  { 
+    "id": "runner_bag",
+    "copy-from": "runner_bag",
+    "type": "ARMOR",
+    "name": { "str": "runner pack" },
+    "weight": "360 g",
+    "storage": "7 L",
+    "encumbrance": 1,
+    "max_encumbrance": 2
+  },
+  {
+    "id": "armrig",
+    "type": "ARMOR",
+    "name": { "str": "armband pouch", "str_pl": "armband pouches" },
+    "description": "A small pouch that can be worn on the upper arm using buckled straps.  This is a favoured item among sports & camping enthusiasts.",
+    "weight": "205 g",
+    "volume": "550 ml",
+    "price": "30 USD",
+    "price_postapoc": "250 cent",
+    "material": [ "cotton", "plastic" ],
+    "symbol": "[",
+    "looks_like": "armguard_soft",
+    "color": "dark_gray",
+    "storage": "500 ml",
+    "covers": [ "arm_either" ],
+    "coverage": 15,
+    "encumbrance": 0,
+    "max_encumbrance": 1,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "BELTED" ],
+    "//": "Psuedo-ported from dda."
+  },
+  { 
+    "id": "vest",
+    "copy-from": "vest",
+    "type": "ARMOR",
+    "name": { "str": "utility vest" },
+    "encumbrance": 2,
+    "max_encumbrance": 5,
+    "extend": { "flags": [ "BELTED" ] },
+    "//": "Changed to strapped layer because this is not a shirt."
+  }
+]
diff --git a/json/items/armor/suits_protection.json b/json/items/armor/suits_protection.json
new file mode 100644
index 0000000..81655f2
--- /dev/null
+++ b/json/items/armor/suits_protection.json
@@ -0,0 +1,93 @@
+[
+  { 
+    "id": "lsurvivor_suit",
+    "copy-from": "lsurvivor_suit",
+    "type": "ARMOR",
+    "name": { "str": "light survivor suit" },
+    "material": [ "kevlar", "cotton" ],
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 7, 10 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ],
+    "storage": "7 L",
+    "//": "Reduced the carrying volume from 7.5 to 7 litres."
+  },
+  { 
+    "id": "survivor_suit",
+    "copy-from": "survivor_suit",
+    "type": "ARMOR",
+    "name": { "str": "survivor suit" },
+    "material": [ "kevlar", "leather" ],
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 20 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 12, 17 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 12, 12 ] }
+    ]
+  },
+  { 
+    "id": "hsurvivor_suit",
+    "copy-from": "hsurvivor_suit",
+    "type": "ARMOR",
+    "name": { "str": "heavy survivor suit" },
+    "material": [ "kevlar", "steel", "leather" ],
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 31 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] }
+    ]
+  },
+  {
+    "id": "sasurvivor_suit",
+    "copy-from": "sasurvivor_suit",
+    "type": "ARMOR",
+    "name": { "str": "superalloy survivor suit" },
+    "material": [ "kevlar", "superalloy", "leather" ],
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 15, 25 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 15, 20 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 15, 15 ] }
+    ]
+  },
+  {
+    "id": "wsurvivor_suit",
+    "copy-from": "wsurvivor_suit",
+    "type": "ARMOR",
+    "name": { "str": "winter survivor suit" },
+    "material": [ "kevlar", "fur" ],
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 31 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] }
+    ]
+  },
+  { 
+    "id": "armor_riot",
+    "copy-from": "armor_riot",
+    "type": "ARMOR",
+    "name": { "str": "riot armor" },
+    "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.  The word POLICE is emblazoned across the front.",
+    "weight": "3000 g",
+    "volume": "12500 ml",
+    "material": [ "plastic" ],
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 85, "encumbrance": 6 },
+      { "covers": [ "legs", "arms" ], "coverage": 75, "encumbrance": 4 },
+      { "covers": [ "feet" ], "coverage": 75, "encumbrance": 2 }
+    ],
+    "flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ],
+    "//": "Rebalance this based on dda's concept of it being a strapped on set of armor pads. Essentially a step up in quality from the individual hard plastic armor pieces."
+  },
+  {
+    "id": "armor_larmor",
+    "copy-from": "armor_larmor",
+    "type": "ARMOR",
+    "name": { "str": "leather body armor" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 16, 16 ] },
+      { "covers": [ "arms" ], "coverage": 90, "encumbrance": [ 14, 14 ] },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 14, 14 ] }
+    ]
+  }
+  
+]
diff --git a/json/items/armor/torso_armor.json b/json/items/armor/torso_armor.json
new file mode 100644
index 0000000..e82ed7c
--- /dev/null
+++ b/json/items/armor/torso_armor.json
@@ -0,0 +1,11 @@
+[
+  { 
+    "id": "chestguard_hard",
+    "copy-from": "chestguard_hard",
+    "type": "ARMOR",
+    "name": { "str": "hard chest guard" },
+    "material_thickness": 4,
+    "encumbrance": 4,
+    "//": "Buff this to be as durable as the other hard plastic armor pieces."
+  }
+]
diff --git a/json/items/armor/torso_clothes.json b/json/items/armor/torso_clothes.json
new file mode 100644
index 0000000..c3daa36
--- /dev/null
+++ b/json/items/armor/torso_clothes.json
@@ -0,0 +1,12 @@
+[
+  { 
+    "id": "dress_shirt",
+    "copy-from": "dress_shirt",
+    "type": "ARMOR",
+    "name": { "str": "dress shirt" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 90, "encumbrance": [ 4, 5 ] },
+      { "covers": [ "arms" ], "coverage": 90, "encumbrance": [ 4, 4 ] }
+    ]
+  }
+]