From e1e0ccb4fbc796786e6a76d2b3a297a21f66dc48 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Sat, 7 Mar 2020 23:04:28 +0100
Subject: [PATCH 01/36] New guns

A handful of guns I was missing in the game, starting with the big brother of the KSG, the ridiculous KSG-25.
---
 .../itemgroups/Weapons_Mods_Ammo/guns.json    |  1 +
 data/json/items/gun/shot.json                 | 33 +++++++++++++++++++
 data/json/items/gunmod/underbarrel.json       | 24 ++++++++++++++
 3 files changed, 58 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 55a9bdee9a010..e6e9c7d040de6 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -316,6 +316,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "ksg", "prob": 50, "charges-min": 0, "charges-max": 7 },
+	  { "item": "ksg-25", "prob": 8, "charges-min": 0, "charges-max": 12 }
       { "item": "tavor_12", "prob": 5, "charges-min": 0, "charges-max": 16 },
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "SPAS_12", "prob": 2, "charges-min": 0, "charges-max": 9 },
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 09955361117fb..6598945b7eb3c 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -106,6 +106,39 @@
       [ "underbarrel", 2 ]
     ]
   },
+  {
+    "id": "ksg-25",
+    "copy-from": "shotgun_pump",
+    "looks_like": "remington_870",
+    "type": "GUN",
+    "name": { "str": "Kel-Tec KSG-25", "str_pl": "Kel-Tec KSG-25" },
+    "description": "A bullpup pump-action shotgun, the Kel-Tec KSG-25 uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations. The big brother of the KSG, it has a longer barrel and longer magazine tubes.",
+    "weight": "2100 g",
+    "volume": "4495 ml",
+    "price": 140000,
+    "to_hit": -1,
+    "bashing": 9,
+    "material": [ "steel", "plastic" ],
+    "ranged_damage": 5,
+    "dispersion": 425,
+    "sight_dispersion": 500,
+    "durability": 7,
+    "clip_size": 12,
+    "built_in_mods": [ "ksg25_aux_shotgun" ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel", 2 ]
+    ]
+  },
   {
     "id": "m1014",
     "copy-from": "shotgun_base",
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index b500cb77efca5..14a600ad94a0d 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -130,6 +130,30 @@
     },
     "flags": [ "RELOAD_ONE", "IRREMOVABLE" ]
   },
+  {
+    "id": "ksg25_aux_shotgun",
+    "type": "GUNMOD",
+    "name": { "str": "KSG-25 second magazine" },
+    "description": "The integrated second shotgun magazine of the Kel-Tec KSG-25 which holds 12 shots.  It's irremovable.",
+    "weight": "1550 g",
+    "volume": "1750 ml",
+    "price": 0,
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "light_red",
+    "location": "underbarrel",
+    "mod_targets": [ "shotgun" ],
+    "gun_data": {
+      "ammo": "shot",
+      "skill": "shotgun",
+      "ranged_damage": 5,
+      "dispersion": 425,
+      "durability": 7,
+      "clip_size": 12,
+      "reload": 120
+    },
+    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ]
+  },
   {
     "id": "ts12_aux_shotgun",
     "type": "GUNMOD",

From dacb0d1da5d53046f44eb784db25c7849eacf6ca Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Mon, 9 Mar 2020 23:51:02 +0100
Subject: [PATCH 02/36] Some Beretta handguns

Added the Beretta 90two and the Px4 Storm, in both 9mm and .40 S&W variations. Also added appropriate magazines for the .40 S&W variants. 9mm share the M9 magazine, for now.
---
 .../itemgroups/Weapons_Mods_Ammo/guns.json    |  4 ++
 .../Weapons_Mods_Ammo/magazines.json          |  2 +
 data/json/items/gun/40.json                   | 46 +++++++++++++++++++
 data/json/items/gun/9mm.json                  | 46 +++++++++++++++++++
 data/json/items/gun/shot.json                 |  2 +-
 data/json/items/magazine/40.json              | 36 +++++++++++++++
 6 files changed, 135 insertions(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index e6e9c7d040de6..bf8ca5693173e 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -10,6 +10,8 @@
       { "item": "glock_31", "prob": 15, "charges-min": 0, "charges-max": 15 },
       { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 7 },
       { "item": "m9", "prob": 30, "charges-min": 0, "charges-max": 15 },
+	  { "item": "px4", "prob": 24, "charges-min": 0, "charges-max": 15 },
+	  { "item": "px4_40", "prob": 20, "charges-min": 0, "charges-max": 14 },
       { "item": "ruger_lcr_38", "prob": 10, "charges-min": 0, "charges-max": 5 },
       { "item": "sig_mosquito", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "sw_22", "prob": 15, "charges-min": 0, "charges-max": 10 },
@@ -43,6 +45,8 @@
     "id": "guns_pistol_rare",
     "//": "Less common pistols including those only used by police/paramilitary forces.",
     "items": [
+	  { "item": "90two", "prob": 25, "charges-min": 0, "charges-max": 15 },
+	  { "item": "90two40", "prob": 10, "charges-min": 0, "charges-max": 12 },
       { "item": "bond_410", "prob": 20, "charges-min": 0, "charges-max": 2 },
       { "item": "deagle_44", "prob": 35, "charges-min": 0, "charges-max": 8 },
       { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 9 },
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 1d753bfaefb78..55af430c62f45 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -108,6 +108,7 @@
       [ "40_speedloader6", 10 ],
       [ "glock17_17", 14 ],
       [ "glock17_22", 6 ],
+	  [ "px4_40mag", 6 ],
       [ "glockmag", 33 ],
       [ "glock40mag", 7 ],
       [ "m1911mag", 25 ],
@@ -161,6 +162,7 @@
       [ "9mm_speedloader7", 10 ],
       [ "glock_drum_50rd", 5 ],
       [ "glock_drum_100rd", 5 ],
+	  [ "90two40mag", 5 ],
       [ "deaglemag", 40 ],
       [ "fn57mag", 80 ],
       [ "glockbigmag", 60 ],
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index abe8886da2576..878b98bc1ac75 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -1,4 +1,27 @@
 [
+  {
+    "id": "90two40",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta 90two .40 S&W" },
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same. The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover. This one is chambered in .40 S&w.",
+    "weight": "921 g",
+    "volume": "518 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "range": 1,
+    "dispersion": 480,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "40", [ "90two40mag" ] ] ]
+  },
   {
     "id": "glock_22",
     "looks_like": "glock_17",
@@ -38,6 +61,29 @@
     "magazine_well": 1,
     "magazines": [ [ "40", [ "glock40mag", "glock40bigmag" ] ] ]
   },
+  {
+    "id": "px4_40",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta Px4 Storm .40 S&W" },
+    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utlizing light-weight polymer construction with steel inserts. Its shape was also optimized for concealed carry. This one is chambered in .40 S&W.",
+    "weight": "785 g",
+    "volume": "505 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "plastic", "steel" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "range": 1,
+    "dispersion": 480,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "40", [ "px4_40mag" ] ] ]
+  },
   {
     "id": "rifle_40",
     "copy-from": "gun_base",
diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 3beaf9b943f69..2e21159e5b40d 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -1,4 +1,27 @@
 [
+  {
+    "id": "90two",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta 90two" },
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same. The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.",
+    "weight": "921 g",
+    "volume": "518 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "range": 1,
+    "dispersion": 480,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
+  },  
   {
     "id": "calico",
     "looks_like": "hk_mp5",
@@ -361,6 +384,29 @@
     "magazine_well": 1,
     "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
   },
+  {
+    "id": "px4",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta Px4 Storm" },
+    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utlizing light-weight polymer construction with steel inserts. Its shape was also optimized for concealed carry, while maintaining the reliability the 92 series is known for.",
+    "weight": "785 g",
+    "volume": "505 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "plastic", "steel" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "range": 1,
+    "dispersion": 480,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
+  },
   {
     "id": "rifle_9mm",
     "looks_like": "ar15",
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 6598945b7eb3c..a1a371bdc0aea 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -81,7 +81,7 @@
     "name": { "str": "Kel-Tec KSG", "str_pl": "Kel-Tec KSG" },
     "description": "A bullpup pump-action shotgun, the Kel-Tec KSG uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.",
     "weight": "1550 g",
-    "volume": "4784 ml",
+    "volume": "3371 ml",
     "price": 99000,
     "to_hit": -1,
     "bashing": 9,
diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
index 4a6427952ee11..954e1254a8504 100644
--- a/data/json/items/magazine/40.json
+++ b/data/json/items/magazine/40.json
@@ -15,6 +15,24 @@
     "capacity": 6,
     "flags": [ "SPEEDLOADER" ]
   },
+  {
+    "id": "90two40mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "90two .40 S&W Magazine" },
+    "description": "A magazine for the 92 and 96 series of Beretta handguns, this one is for .40 S&W and can hold 12 rounds.",
+    "weight": "135 g",
+    "volume": "250 ml",
+    "price": 3200,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "40", "357sig" ],
+    "capacity": 12,
+    "reliability": 8,
+    "reload_time": 140,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "glock40bigmag",
     "looks_like": "glock17_17",
@@ -50,6 +68,24 @@
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]
   },
+  {
+    "id": "px4_40mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "Px4 .40 magazine" },
+    "description": "A magazine for the Px4 Storm chambered for .40 S&W. It holds 14 rounds.",
+    "weight": "135 g",
+    "volume": "250 ml",
+    "price": 3200,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "40", "357sig" ],
+    "capacity": 14,
+    "reliability": 8,
+    "reload_time": 140,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "sig40mag",
     "looks_like": "glock17_17",

From 6a71943360b59c079f61f4d939f73735aaffe140 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 00:28:48 +0100
Subject: [PATCH 03/36] The French are coming?

Added the FAMAS G2. Quite how it ended up in New England, we'll never know... should be sufficiently rare to suggest possible illegal important by a crazy gun collector, but values may require tweaking.
---
 .../itemgroups/Weapons_Mods_Ammo/guns.json    |  1 +
 data/json/items/gun/223.json                  | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index bf8ca5693173e..c8d3261a8068a 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -277,6 +277,7 @@
       { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 },
       { "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
       { "item": "carbine_flintlock", "prob": 140 },
+	  { "item": "famas", "prob": 40 },
       { "item": "rifle_flintlock", "prob": 180 },
       { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "trex_gun", "prob": 60 },
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index dee3852ca15b3..93240cd9d51ee 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -45,6 +45,29 @@
     "min_cycle_recoil": 1350,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
+  {
+    "id": "famas",
+    "copy-from": "rifle_auto",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "name": { "str": "FAMAS G2" },
+    "description": "An assault rifle that was until recently used by French armed forces. Famed for its high rate of fire, it was never available in a civilian version.",
+    "weight": "3800 g",
+    "volume": "4674 ml",
+    "price": 540000,
+    "to_hit": -1,
+    "bashing": 12,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "ranged_damage": -2,
+    "dispersion": 180,
+    "durability": 8,
+    "min_cycle_recoil": 1350,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
+    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
   {
     "id": "h&k416a5",
     "copy-from": "rifle_auto",

From e2390ec9f64f7e984cb8a51f6040402084ba9722 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 13:48:00 +0100
Subject: [PATCH 04/36] Update guns.json

---
 data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index c8d3261a8068a..77749e56409e5 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -277,7 +277,7 @@
       { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 },
       { "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
       { "item": "carbine_flintlock", "prob": 140 },
-	  { "item": "famas", "prob": 40 },
+	  { "item": "famas", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "rifle_flintlock", "prob": 180 },
       { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "trex_gun", "prob": 60 },

From 4686bcd0d5b2b1372e9cf8a7a0a14507946206b6 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 13:53:57 +0100
Subject: [PATCH 05/36] Update guns.json

---
 data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 77749e56409e5..cdc831d3eb1a0 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -321,7 +321,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "ksg", "prob": 50, "charges-min": 0, "charges-max": 7 },
-	  { "item": "ksg-25", "prob": 8, "charges-min": 0, "charges-max": 12 }
+	  { "item": "ksg-25", "prob": 8, "charges-min": 0, "charges-max": 12 },
       { "item": "tavor_12", "prob": 5, "charges-min": 0, "charges-max": 16 },
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "SPAS_12", "prob": 2, "charges-min": 0, "charges-max": 9 },

From 636c916ea761af60a6fad0720057108013fc5085 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 13:58:05 +0100
Subject: [PATCH 06/36] Update guns.json

Linted guns.json
---
 data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index cdc831d3eb1a0..93938505ac78a 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -10,8 +10,8 @@
       { "item": "glock_31", "prob": 15, "charges-min": 0, "charges-max": 15 },
       { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 7 },
       { "item": "m9", "prob": 30, "charges-min": 0, "charges-max": 15 },
-	  { "item": "px4", "prob": 24, "charges-min": 0, "charges-max": 15 },
-	  { "item": "px4_40", "prob": 20, "charges-min": 0, "charges-max": 14 },
+      { "item": "px4", "prob": 24, "charges-min": 0, "charges-max": 15 },
+      { "item": "px4_40", "prob": 20, "charges-min": 0, "charges-max": 14 },
       { "item": "ruger_lcr_38", "prob": 10, "charges-min": 0, "charges-max": 5 },
       { "item": "sig_mosquito", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "sw_22", "prob": 15, "charges-min": 0, "charges-max": 10 },
@@ -45,8 +45,8 @@
     "id": "guns_pistol_rare",
     "//": "Less common pistols including those only used by police/paramilitary forces.",
     "items": [
-	  { "item": "90two", "prob": 25, "charges-min": 0, "charges-max": 15 },
-	  { "item": "90two40", "prob": 10, "charges-min": 0, "charges-max": 12 },
+      { "item": "90two", "prob": 25, "charges-min": 0, "charges-max": 15 },
+      { "item": "90two40", "prob": 10, "charges-min": 0, "charges-max": 12 },
       { "item": "bond_410", "prob": 20, "charges-min": 0, "charges-max": 2 },
       { "item": "deagle_44", "prob": 35, "charges-min": 0, "charges-max": 8 },
       { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 9 },
@@ -277,7 +277,7 @@
       { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 },
       { "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
       { "item": "carbine_flintlock", "prob": 140 },
-	  { "item": "famas", "prob": 40, "charges-min": 0, "charges-max": 30 },
+      { "item": "famas", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "rifle_flintlock", "prob": 180 },
       { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "trex_gun", "prob": 60 },
@@ -321,7 +321,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "ksg", "prob": 50, "charges-min": 0, "charges-max": 7 },
-	  { "item": "ksg-25", "prob": 8, "charges-min": 0, "charges-max": 12 },
+      { "item": "ksg-25", "prob": 8, "charges-min": 0, "charges-max": 12 },
       { "item": "tavor_12", "prob": 5, "charges-min": 0, "charges-max": 16 },
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "SPAS_12", "prob": 2, "charges-min": 0, "charges-max": 9 },

From e9be063315d6834e4c62f77eaa86509c97da6522 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 14:03:09 +0100
Subject: [PATCH 07/36] Yet more linting

---
 data/json/itemgroups/Weapons_Mods_Ammo/magazines.json | 4 ++--
 data/json/items/gun/9mm.json                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 55af430c62f45..1be659e27fe2a 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -108,7 +108,7 @@
       [ "40_speedloader6", 10 ],
       [ "glock17_17", 14 ],
       [ "glock17_22", 6 ],
-	  [ "px4_40mag", 6 ],
+      [ "px4_40mag", 6 ],
       [ "glockmag", 33 ],
       [ "glock40mag", 7 ],
       [ "m1911mag", 25 ],
@@ -162,7 +162,7 @@
       [ "9mm_speedloader7", 10 ],
       [ "glock_drum_50rd", 5 ],
       [ "glock_drum_100rd", 5 ],
-	  [ "90two40mag", 5 ],
+      [ "90two40mag", 5 ],
       [ "deaglemag", 40 ],
       [ "fn57mag", 80 ],
       [ "glockbigmag", 60 ],
diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 2e21159e5b40d..36b350ea4ffa1 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -21,7 +21,7 @@
     "min_cycle_recoil": 450,
     "magazine_well": 1,
     "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
-  },  
+  },
   {
     "id": "calico",
     "looks_like": "hk_mp5",

From be58c74bf472323f8b12830616ffefd630508640 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 14:43:50 +0100
Subject: [PATCH 08/36] Update data/json/items/magazine/40.json

Co-Authored-By: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com>
---
 data/json/items/magazine/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
index 954e1254a8504..f7f6124dcda52 100644
--- a/data/json/items/magazine/40.json
+++ b/data/json/items/magazine/40.json
@@ -19,7 +19,7 @@
     "id": "90two40mag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": { "str": "90two .40 S&W Magazine" },
+    "name": { "str": "90two .40 S&W magazine" },
     "description": "A magazine for the 92 and 96 series of Beretta handguns, this one is for .40 S&W and can hold 12 rounds.",
     "weight": "135 g",
     "volume": "250 ml",

From eeae6388776739142784706d4d714010a212edc5 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:01:27 +0100
Subject: [PATCH 09/36] Update 40.json

Forgot to change ammo type in the .40 guns.
---
 data/json/items/gun/40.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 878b98bc1ac75..ea4c9a674b852 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -14,7 +14,7 @@
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "9mm",
+    "ammo": "40",
     "range": 1,
     "dispersion": 480,
     "durability": 7,
@@ -76,7 +76,7 @@
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "9mm",
+    "ammo": "40",
     "range": 1,
     "dispersion": 480,
     "durability": 7,

From 4021048e73cc579c0008ed375fbbb76b1459e4a0 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:39:43 +0100
Subject: [PATCH 10/36] Update data/json/items/magazine/40.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/json/items/magazine/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
index f7f6124dcda52..534407809ed68 100644
--- a/data/json/items/magazine/40.json
+++ b/data/json/items/magazine/40.json
@@ -73,7 +73,7 @@
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "Px4 .40 magazine" },
-    "description": "A magazine for the Px4 Storm chambered for .40 S&W. It holds 14 rounds.",
+    "description": "A magazine for the Px4 Storm chambered for .40 S&W.  It holds 14 rounds.",
     "weight": "135 g",
     "volume": "250 ml",
     "price": 3200,

From ae316c5869bda4be68d8759e7466313d14b820b8 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:39:52 +0100
Subject: [PATCH 11/36] Update data/json/items/gun/shot.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/json/items/gun/shot.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index a1a371bdc0aea..1fa29ed50020d 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -112,7 +112,7 @@
     "looks_like": "remington_870",
     "type": "GUN",
     "name": { "str": "Kel-Tec KSG-25", "str_pl": "Kel-Tec KSG-25" },
-    "description": "A bullpup pump-action shotgun, the Kel-Tec KSG-25 uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations. The big brother of the KSG, it has a longer barrel and longer magazine tubes.",
+    "description": "A bullpup pump-action shotgun, the Kel-Tec KSG-25 uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.  The big brother of the KSG, it has a longer barrel and longer magazine tubes.",
     "weight": "2100 g",
     "volume": "4495 ml",
     "price": 140000,

From 32b4ad96a8930fb65d92e6e3eb6c90b634a2a581 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:40:02 +0100
Subject: [PATCH 12/36] Update data/json/items/gun/9mm.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/json/items/gun/9mm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 36b350ea4ffa1..207952883f1ee 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -390,7 +390,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str": "Beretta Px4 Storm" },
-    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utlizing light-weight polymer construction with steel inserts. Its shape was also optimized for concealed carry, while maintaining the reliability the 92 series is known for.",
+    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utilizing light-weight polymer construction with steel inserts.  Its shape was also optimized for concealed carry, while maintaining the reliability the 92 series is known for.",
     "weight": "785 g",
     "volume": "505 ml",
     "price": 65000,

From e07371f4e7b22a2aa319ce0e9abfa4bf00b85dd3 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:40:11 +0100
Subject: [PATCH 13/36] Update data/json/items/gun/9mm.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/json/items/gun/9mm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 207952883f1ee..5b27c6efaa402 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -5,7 +5,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str": "Beretta 90two" },
-    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same. The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.",
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.",
     "weight": "921 g",
     "volume": "518 ml",
     "price": 65000,

From c5ec4b8c0e39db497b288ea58ee6ecdfe711f642 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:40:20 +0100
Subject: [PATCH 14/36] Update data/json/items/gun/40.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/json/items/gun/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index ea4c9a674b852..65e47fa8ba0aa 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -67,7 +67,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str": "Beretta Px4 Storm .40 S&W" },
-    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utlizing light-weight polymer construction with steel inserts. Its shape was also optimized for concealed carry. This one is chambered in .40 S&W.",
+    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utilizing light-weight polymer construction with steel inserts.  Its shape was also optimized for concealed carry.  This one is chambered in .40 S&W.",
     "weight": "785 g",
     "volume": "505 ml",
     "price": 65000,

From 97c63c1d22489b8b1eb5e0227e60d4fb2a40102b Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:40:43 +0100
Subject: [PATCH 15/36] Update data/json/items/gun/40.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/json/items/gun/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 65e47fa8ba0aa..711ce411f58a9 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -5,7 +5,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str": "Beretta 90two .40 S&W" },
-    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same. The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover. This one is chambered in .40 S&w.",
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.  This one is chambered in .40 S&w.",
     "weight": "921 g",
     "volume": "518 ml",
     "price": 65000,

From cb97957f99ba8fc0a9654bc0cc07ea4c819d6609 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:40:51 +0100
Subject: [PATCH 16/36] Update data/json/items/gun/223.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/json/items/gun/223.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 93240cd9d51ee..939626c4457e7 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -51,7 +51,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str": "FAMAS G2" },
-    "description": "An assault rifle that was until recently used by French armed forces. Famed for its high rate of fire, it was never available in a civilian version.",
+    "description": "An assault rifle that was until recently used by French armed forces.  Famous for its high rate of fire, it was never available in a civilian version.",
     "weight": "3800 g",
     "volume": "4674 ml",
     "price": 540000,

From e524f1d3b0f21fe950210c59c96168d7130299a8 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:43:15 +0100
Subject: [PATCH 17/36] Update 40.json

Fixed capitalization error.
---
 data/json/items/gun/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 711ce411f58a9..a75fd67a83ef0 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -5,7 +5,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str": "Beretta 90two .40 S&W" },
-    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.  This one is chambered in .40 S&w.",
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.  This one is chambered in .40 S&W.",
     "weight": "921 g",
     "volume": "518 ml",
     "price": 65000,

From b0b215b1742a23b149b243f11480af1b7abf53be Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:58:00 +0100
Subject: [PATCH 18/36] Update data/json/items/gun/9mm.json

Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
---
 data/json/items/gun/9mm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 5b27c6efaa402..205623f1a290e 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -5,7 +5,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str": "Beretta 90two" },
-    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.",
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.",
     "weight": "921 g",
     "volume": "518 ml",
     "price": 65000,

From 2cc59d09f09a8da6a72487208cd0e46e77dbfd51 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:58:08 +0100
Subject: [PATCH 19/36] Update data/json/items/gun/40.json

Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
---
 data/json/items/gun/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index a75fd67a83ef0..cfc8b4271503f 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -5,7 +5,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str": "Beretta 90two .40 S&W" },
-    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.  This one is chambered in .40 S&W.",
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.  This one is chambered in .40 S&W.",
     "weight": "921 g",
     "volume": "518 ml",
     "price": 65000,

From 35c8f80cc965fcec795d4fba6eaf86570fbe02e0 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:58:20 +0100
Subject: [PATCH 20/36] Update data/json/items/gun/9mm.json

Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
---
 data/json/items/gun/9mm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 205623f1a290e..1cca229d0f480 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -4,7 +4,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "Beretta 90two" },
+    "name": { "str": "Beretta 90-two" },
     "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.",
     "weight": "921 g",
     "volume": "518 ml",

From bcfe96f380bec2cb72b0b468ec2ccf593967945e Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:58:30 +0100
Subject: [PATCH 21/36] Update data/json/items/gun/40.json

Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
---
 data/json/items/gun/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index cfc8b4271503f..fc0d71d680faa 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -4,7 +4,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str": "Beretta 90two .40 S&W" },
+    "name": { "str": "Beretta 90-two .40 S&W" },
     "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.  This one is chambered in .40 S&W.",
     "weight": "921 g",
     "volume": "518 ml",

From 643351a9d04266bdf8c4ae0fd307b84abba83953 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:58:42 +0100
Subject: [PATCH 22/36] Update data/json/items/gun/9mm.json

Co-Authored-By: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
---
 data/json/items/gun/9mm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 1cca229d0f480..4537061d672ee 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -11,7 +11,7 @@
     "price": 65000,
     "to_hit": -2,
     "bashing": 8,
-    "material": [ "steel", "aluminum" ],
+    "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
     "ammo": "9mm",

From d65cf61bfc3e4235b58ca7b72c173fa3f0ef221f Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:58:51 +0100
Subject: [PATCH 23/36] Update data/json/items/gun/40.json

Co-Authored-By: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
---
 data/json/items/gun/40.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index fc0d71d680faa..953677a8e0029 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -11,7 +11,7 @@
     "price": 65000,
     "to_hit": -2,
     "bashing": 8,
-    "material": [ "steel", "aluminum" ],
+    "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
     "ammo": "40",

From 76b67cd3b2848a1c292ede56c24fcccd2c024e03 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:59:07 +0100
Subject: [PATCH 24/36] Update data/json/items/gun/223.json

Co-Authored-By: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
---
 data/json/items/gun/223.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 939626c4457e7..89f7975e280d8 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -54,7 +54,7 @@
     "description": "An assault rifle that was until recently used by French armed forces.  Famous for its high rate of fire, it was never available in a civilian version.",
     "weight": "3800 g",
     "volume": "4674 ml",
-    "price": 540000,
+    "price": 2800000,
     "to_hit": -1,
     "bashing": 12,
     "material": [ "steel", "plastic" ],

From 4c73599864db1a57323538beed9dba81e2bc54bd Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:03:36 +0100
Subject: [PATCH 25/36] Update 223.json

---
 data/json/items/gun/223.json | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 89f7975e280d8..aaa8624476503 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -51,9 +51,9 @@
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str": "FAMAS G2" },
-    "description": "An assault rifle that was until recently used by French armed forces.  Famous for its high rate of fire, it was never available in a civilian version.",
+    "description": "An assault rifle that was until recently used by French armed forces.  While it is famous for its high fire rate, this is a semi-auto only variation imported to the US in the late eighties. It does come with an integral bipod, though.",
     "weight": "3800 g",
-    "volume": "4674 ml",
+    "volume": "4162 ml",
     "price": 2800000,
     "to_hit": -1,
     "bashing": 12,
@@ -65,7 +65,20 @@
     "dispersion": 180,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
+    "built_in_mods": [ "bipod" ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 4 ],
+      [ "magazine", 1 ],
+      [ "muzzle", 1 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel mount", 1 ],
+      [ "underbarrel", 1 ]
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {

From 8e386377a5032049b2183eabc19c5eb929ea42f3 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:04:14 +0100
Subject: [PATCH 26/36] Update data/json/items/gun/223.json

Co-Authored-By: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
---
 data/json/items/gun/223.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index aaa8624476503..b8b45f0b36388 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -50,7 +50,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": { "str": "FAMAS G2" },
+    "name": { "str": "MAS .223", "str_pl": "MAS .223" },
     "description": "An assault rifle that was until recently used by French armed forces.  While it is famous for its high fire rate, this is a semi-auto only variation imported to the US in the late eighties. It does come with an integral bipod, though.",
     "weight": "3800 g",
     "volume": "4162 ml",

From 4e5faffd258331f7fb4f0ee9cd7fe2193cb04ed9 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:10:28 +0100
Subject: [PATCH 27/36] Some changes

Added a proprietary magazine for the MAS 223.
---
 data/json/items/gun/223.json      |  4 ++--
 data/json/items/magazine/223.json | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index b8b45f0b36388..03d5f0623ee60 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -50,7 +50,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": { "str": "MAS .223", "str_pl": "MAS .223" },
+    "name": { "str": "MAS 223", "str_pl": "MAS 223" },
     "description": "An assault rifle that was until recently used by French armed forces.  While it is famous for its high fire rate, this is a semi-auto only variation imported to the US in the late eighties. It does come with an integral bipod, though.",
     "weight": "3800 g",
     "volume": "4162 ml",
@@ -79,7 +79,7 @@
       [ "sling", 1 ],
       [ "underbarrel mount", 1 ],
       [ "underbarrel", 1 ]
-    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+    "magazines": [ [ "223", [ "famasmag" ] ] ]
   },
   {
     "id": "h&k416a5",
diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
index 47d69c343d536..39e59b1f51952 100644
--- a/data/json/items/magazine/223.json
+++ b/data/json/items/magazine/223.json
@@ -27,6 +27,23 @@
     "default_ammo": "556",
     "linkage": "ammolink223"
   },
+  {
+    "id": "famasmag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "MAS 223 magazine" },
+    "description": "A 25-round magazine for the MAS 223.  It resembles a STANAG magazine but is not compatible nor interchangeable.",
+    "weight": "340 g",
+    "volume": "480 ml",
+    "price": 115000,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "223",
+    "capacity": 25,
+    "reliability": 8,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "lw223bigmag",
     "looks_like": "stanag30",

From de3e8041f7f9b92d3dabcc6b309fc947351a50c3 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:11:30 +0100
Subject: [PATCH 28/36] Update data/json/items/gun/223.json

Co-Authored-By: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
---
 data/json/items/gun/223.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 03d5f0623ee60..c80717297b648 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -51,7 +51,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str": "MAS 223", "str_pl": "MAS 223" },
-    "description": "An assault rifle that was until recently used by French armed forces.  While it is famous for its high fire rate, this is a semi-auto only variation imported to the US in the late eighties. It does come with an integral bipod, though.",
+    "description": "A bullpup assault rifle that was used by French armed forces only until recently.  While the FAMAS was famous for its high fire rate, the MAS .223 is a semi-auto only variation imported to the US in the late eighties.  It retains the integral bipod, though.",
     "weight": "3800 g",
     "volume": "4162 ml",
     "price": 2800000,

From c635b048a25b4556b7f46d39db10d24876e2ea52 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:12:59 +0100
Subject: [PATCH 29/36] Update 223.json

Fixed missing closing bracket.
---
 data/json/items/gun/223.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index c80717297b648..44a7ef4cdd94a 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -79,6 +79,7 @@
       [ "sling", 1 ],
       [ "underbarrel mount", 1 ],
       [ "underbarrel", 1 ]
+	]
     "magazines": [ [ "223", [ "famasmag" ] ] ]
   },
   {

From 9cefdb9fc786408564e41abdd00cf62c7f260a58 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:19:45 +0100
Subject: [PATCH 30/36] Update data/json/items/gun/223.json

Co-Authored-By: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
---
 data/json/items/gun/223.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 44a7ef4cdd94a..763d684322522 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -79,7 +79,7 @@
       [ "sling", 1 ],
       [ "underbarrel mount", 1 ],
       [ "underbarrel", 1 ]
-	]
+	],
     "magazines": [ [ "223", [ "famasmag" ] ] ]
   },
   {

From 081c369e05a693ccadfb96ff913a11f4ada6af10 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:42:33 +0100
Subject: [PATCH 31/36] Update 223.json

Resolved conflict (hopefully).
---
 data/json/items/magazine/223.json | 36 -------------------------------
 1 file changed, 36 deletions(-)

diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
index 39e59b1f51952..7baa0df7caa72 100644
--- a/data/json/items/magazine/223.json
+++ b/data/json/items/magazine/223.json
@@ -44,42 +44,6 @@
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]
   },
-  {
-    "id": "lw223bigmag",
-    "looks_like": "stanag30",
-    "type": "MAGAZINE",
-    "name": { "str": "LW-56 magazine" },
-    "description": "A 56-round polymer magazine for Leadworks LLC 223 firearms.  It's compact design makes it surprisingly easy to store.  Lightweight and reliable but somewhat more difficult to reload.",
-    "weight": "340 g",
-    "volume": "750 ml",
-    "price": 14200,
-    "material": "plastic",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "223",
-    "capacity": 56,
-    "reliability": 9,
-    "reload_time": 160,
-    "flags": [ "MAG_COMPACT" ]
-  },
-  {
-    "id": "lw223mag",
-    "looks_like": "stanag30",
-    "type": "MAGAZINE",
-    "name": { "str": "LW-32 magazine" },
-    "description": "A 32-round polymer magazine for Leadworks LLC 223 firearms.  Lightweight and reliable but somewhat more difficult to reload.",
-    "weight": "190 g",
-    "volume": "500 ml",
-    "price": 10200,
-    "material": "plastic",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "223",
-    "capacity": 32,
-    "reliability": 9,
-    "reload_time": 120,
-    "flags": [ "MAG_COMPACT" ]
-  },
   {
     "id": "ruger5",
     "looks_like": "stanag30",

From c1b894b4839802aad50b58be2fecf4e4f6649afc Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:53:39 +0100
Subject: [PATCH 32/36] Yet more linting...

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

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 763d684322522..cd74d07aeba64 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -79,7 +79,7 @@
       [ "sling", 1 ],
       [ "underbarrel mount", 1 ],
       [ "underbarrel", 1 ]
-	],
+    ],
     "magazines": [ [ "223", [ "famasmag" ] ] ]
   },
   {

From 70126da1ec28a3cd1b5f465446e5138ec4d67aae Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 21:31:22 +0100
Subject: [PATCH 33/36] Px4-mag + Generic Guns support

Added separate mag for the Px4 as well as the necessary GG migration/blacklist entries.
---
 data/json/items/gun/9mm.json                    |  4 ++--
 data/json/items/magazine/9mm.json               | 17 +++++++++++++++++
 .../firearms/gg_firearms_migration.json         | 10 ++++++++--
 .../gunmods/gg_gunmods_blacklist.json           |  1 +
 .../magazines/gg_magazines_migration.json       |  8 ++++++--
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index b608b5dc65e3e..83af955e19f75 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -343,11 +343,11 @@
     "color": "dark_gray",
     "ammo": "9mm",
     "range": 1,
-    "dispersion": 480,
+    "dispersion": 440,
     "durability": 7,
     "min_cycle_recoil": 450,
     "magazine_well": 1,
-    "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
+    "magazines": [ [ "9mm", [ "px4mag" ] ] ]
   },
   {
     "id": "rifle_9mm",
diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json
index dd47b3e694514..790366733e17e 100644
--- a/data/json/items/magazine/9mm.json
+++ b/data/json/items/magazine/9mm.json
@@ -191,6 +191,23 @@
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
   },
+  {
+    "id": "px4mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "Px4 magazine" },
+    "description": "The standard magazine for the Beretta Px4, in 9x19mm.",
+    "weight": "135 g",
+    "volume": "250 ml",
+    "price": 3600,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "9mm",
+    "capacity": 17,
+    "reliability": 8,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "stenmag",
     "looks_like": "mp5mag",
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 9e670dda9d701..f9e868326c25f 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -114,7 +114,11 @@
       "kpf9",
       "walther_ppq_9mm",
       "hptc9",
-      "cz75"
+      "cz75",
+	  "90two",
+	  "px4",
+	  "90two40",
+	  "px4_40"
     ],
     "type": "MIGRATION",
     "replace": "pistol_medium"
@@ -255,7 +259,8 @@
       "fn_fal",
       "m1a",
       "sks",
-      "mosin44"
+      "mosin44",
+	  "famas"
     ],
     "type": "MIGRATION",
     "replace": "rifle_sporter"
@@ -290,6 +295,7 @@
       "shotgun_410",
       "browning_a5",
       "ksg",
+	  "ksg-25",
       "m1014",
       "mossberg_500",
       "mossberg_500_security",
diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
index 74156fe6524b6..37022af475dc7 100644
--- a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
+++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
@@ -6,6 +6,7 @@
     "dias",
     "M6_shotgun",
     "ksg_aux_shotgun",
+	"ksg25_aux_shotgun",
     "combination_gun_shotgun",
     "combination_gun_shotgun_pipe",
     "belt_clip",
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
index 13723cfef68d2..d1649670203b9 100644
--- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
+++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -49,7 +49,10 @@
       "hptc9mag_15rd",
       "cz75mag_12rd",
       "cz75mag_20rd",
-      "ccpmag"
+      "ccpmag",
+	  "px4mag",
+	  "90two40mag",
+	  "px4_40mag",
     ],
     "type": "MIGRATION",
     "replace": "pistol_mag"
@@ -164,7 +167,8 @@
       "8x40_250_mag",
       "8x40_25_mag",
       "8x40_500_mag",
-      "8x40_50_mag"
+      "8x40_50_mag",
+	  "famasmag"
     ],
     "type": "MIGRATION",
     "replace": "rifle_mag"

From 3405d66ae9e23e6bd0f6d0dba092586717029900 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 21:48:55 +0100
Subject: [PATCH 34/36] More linting

---
 .../json/itemgroups/Weapons_Mods_Ammo/magazines.json |  1 +
 .../Generic_Guns/firearms/gg_firearms_migration.json | 12 ++++++------
 .../Generic_Guns/gunmods/gg_gunmods_blacklist.json   |  2 +-
 .../magazines/gg_magazines_migration.json            |  8 ++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 98eec4ba7607b..f808ffb0c42ac 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -108,6 +108,7 @@
       [ "40_speedloader6", 10 ],
       [ "glock17_17", 14 ],
       [ "glock17_22", 6 ],
+      [ "px4mag", 55 ],
       [ "px4_40mag", 6 ],
       [ "glockmag", 33 ],
       [ "glock40mag", 7 ],
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index f9e868326c25f..c4038a757ee8a 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -115,10 +115,10 @@
       "walther_ppq_9mm",
       "hptc9",
       "cz75",
-	  "90two",
-	  "px4",
-	  "90two40",
-	  "px4_40"
+      "90two",
+      "px4",
+      "90two40",
+      "px4_40"
     ],
     "type": "MIGRATION",
     "replace": "pistol_medium"
@@ -260,7 +260,7 @@
       "m1a",
       "sks",
       "mosin44",
-	  "famas"
+      "famas"
     ],
     "type": "MIGRATION",
     "replace": "rifle_sporter"
@@ -295,7 +295,7 @@
       "shotgun_410",
       "browning_a5",
       "ksg",
-	  "ksg-25",
+      "ksg-25",
       "m1014",
       "mossberg_500",
       "mossberg_500_security",
diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
index 37022af475dc7..942d253a4958f 100644
--- a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
+++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
@@ -6,7 +6,7 @@
     "dias",
     "M6_shotgun",
     "ksg_aux_shotgun",
-	"ksg25_aux_shotgun",
+    "ksg25_aux_shotgun",
     "combination_gun_shotgun",
     "combination_gun_shotgun_pipe",
     "belt_clip",
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
index d1649670203b9..97c055f37d299 100644
--- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
+++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -50,9 +50,9 @@
       "cz75mag_12rd",
       "cz75mag_20rd",
       "ccpmag",
-	  "px4mag",
-	  "90two40mag",
-	  "px4_40mag",
+      "px4mag",
+      "90two40mag",
+      "px4_40mag"
     ],
     "type": "MIGRATION",
     "replace": "pistol_mag"
@@ -168,7 +168,7 @@
       "8x40_25_mag",
       "8x40_500_mag",
       "8x40_50_mag",
-	  "famasmag"
+      "famasmag"
     ],
     "type": "MIGRATION",
     "replace": "rifle_mag"

From 600872957f2233ed37e003d0a8f68a76cba7486c Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Wed, 11 Mar 2020 21:55:39 +0100
Subject: [PATCH 35/36] Adjusted MAS223 droprate

Forgot to actually change the probability before.
---
 data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 76f39ec8337f3..b8a26f7df28cd 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -264,7 +264,7 @@
       { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 },
       { "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
       { "item": "carbine_flintlock", "prob": 140 },
-      { "item": "famas", "prob": 40, "charges-min": 0, "charges-max": 30 },
+      { "item": "famas", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "rifle_flintlock", "prob": 180 },
       { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "trex_gun", "prob": 60 },

From aa39be1fda75f110357c8b7bc38fcaad7b61b1f1 Mon Sep 17 00:00:00 2001
From: GennFaol <60406715+GennFaol@users.noreply.github.com>
Date: Fri, 3 Apr 2020 11:31:11 +0200
Subject: [PATCH 36/36] Update 223.json

---
 data/json/items/gun/223.json | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index f17894ddf9671..bc457a109dc02 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -45,6 +45,29 @@
     "min_cycle_recoil": 1350,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
+  {
+    "id": "ar_pistol",
+    "copy-from": "rifle_semi",
+    "looks_like": "skorpion_61",
+    "type": "GUN",
+    "name": { "str": "AR pistol" },
+    "description": "A compact, 7.5 inch barrel version of the classic AR-15 design, commercially marketed as a home defense weapon.",
+    "weight": "2267 g",
+    "volume": "1758 ml",
+    "price": 91400,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "range": -6,
+    "ranged_damage": -9,
+    "dispersion": 380,
+    "durability": 6,
+    "min_cycle_recoil": 1350,
+    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
   {
     "id": "famas",
     "copy-from": "rifle_auto",