From 841421bc7bcbfad38533a8ea1d16cc189647b89d Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 12 Mar 2024 00:06:39 -0700
Subject: Merge mbr_vests_return mod.

---
 json/items/armor/ammo_pouch.json | 53 ++++++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 7 deletions(-)

(limited to 'json/items/armor/ammo_pouch.json')

diff --git a/json/items/armor/ammo_pouch.json b/json/items/armor/ammo_pouch.json
index eb19d7d..22f0b65 100644
--- a/json/items/armor/ammo_pouch.json
+++ b/json/items/armor/ammo_pouch.json
@@ -8,13 +8,6 @@
     "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",
@@ -24,6 +17,52 @@
     "encumbrance": 1,
     "max_encumbrance": 2
   },
+  {
+    "id": "legpouch_large",
+    "copy-from": "legpouch_large",
+    "type": "ARMOR",
+    "name": { "str": "leg magazine pouch", "str_pl": "leg magazine pouches" },
+    "extend": { "flags": [ "COMPACT" ] }
+  },
+  {
+    "id": "modularvest",
+    "copy-from": "modularvest",
+    "type": "ARMOR",
+    "name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" },
+    "encumbrance": 8
+  },
+  {
+    "id": "modularvestceramic",
+    "copy-from": "modularvestceramic",
+    "type": "ARMOR",
+    "name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" },
+    "weight": "4308 g",
+    "encumbrance": 10
+  },
+  {
+    "id": "modularvesthard",
+    "type": "ARMOR",
+    "copy-from": "modularvesthard",
+    "name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" },
+    "weight": "14860 g",
+    "encumbrance": 20
+  },
+  {
+    "id": "modularveststeel",
+    "copy-from": "modularveststeel",
+    "type": "ARMOR",
+    "name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" },
+    "weight": "10860 g",
+    "price": "399 USD",
+    "encumbrance": 20
+  },
+  {
+    "id": "modularvestsuper",
+    "copy-from": "modularvestsuper",
+    "type": "ARMOR",
+    "name": { "str": "MBR vest (superalloy)", "str_pl": "MBR vests (superalloy)" },
+    "encumbrance": 15
+  },
   {
     "id": "tacvest",
     "copy-from": "tacvest",
-- 
cgit v1.2.1