Merge pull request #36863 from Brian-Otten/removespawn-improvisedfill…

…edmbr Remove improvised filled MBR from military spawngroups
CleverRaven · Jan 10, 2020 · 3e623a3 · 3e623a3
2 parents 1ce9b9e + caa021c
commit 3e623a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
@@ -1814,12 +1814,9 @@
       [ "winter_gloves_army", 30 ],
       [ "army_top", 30 ],
       [ "kevlar", 10 ],
-      [ "modularvest", 15 ],
-      [ "modularvestkevlar", 18 ],
-      [ "modularvestceramic", 25 ],
-      [ "modularveststeel", 20 ],
-      [ "modularvestsuper", 2 ],
-      [ "modularvesthard", 1 ],
+      [ "modularvest", 25 ],
+      [ "modularvestkevlar", 23 ],
+      [ "modularvestceramic", 30 ],
       [ "vest", 15 ],
       [ "mask_gas", 10 ],
       [ "goggles_nv", 1 ],
@@ -1896,12 +1893,9 @@
     "id": "mil_armor_torso",
     "items": [
       [ "kevlar", 10 ],
-      [ "modularvest", 15 ],
-      [ "modularvestkevlar", 18 ],
-      [ "modularvestceramic", 25 ],
-      [ "modularveststeel", 20 ],
-      [ "modularvestsuper", 2 ],
-      [ "modularvesthard", 1 ],
+      [ "modularvest", 25 ],
+      [ "modularvestkevlar", 23 ],
+      [ "modularvestceramic", 30 ],
       [ "winter_jacket_army", 30 ],
       [ "vest", 15 ],
       [ "tacvest", 10 ],

diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -2489,12 +2489,9 @@
       [ "gloves_tactical", 10 ],
       [ "jumpsuit", 20 ],
       [ "kevlar", 10 ],
-      [ "modularvest", 15 ],
-      [ "modularvestkevlar", 18 ],
-      [ "modularvestceramic", 25 ],
-      [ "modularveststeel", 20 ],
-      [ "modularvestsuper", 8 ],
-      [ "modularvesthard", 5 ],
+      [ "modularvest", 27 ],
+      [ "modularvestkevlar", 28 ],
+      [ "modularvestceramic", 34 ],
       [ "kevlar_plate", 10 ],
       [ "mask_gas", 10 ],
       [ "helmet_army", 40 ],