From 40320f36d4c19f4e03559f8e7a9fa3a93366e6a2 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 15:50:16 +0100
Subject: [PATCH 01/10] Added guns

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

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index f23097f240a77..6597a5e69e9b8 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -45,6 +45,31 @@
     "min_cycle_recoil": 1350,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
+  {
+    "id": "db15",
+    "copy-from": "rifle_semi",
+    "looks_like": "skorpion_61",
+    "type": "GUN",
+    "name": { "str": "DB-15" },
+    "description": "An AR-15 derivative AR pistol manufactured by Diamondback Firearms.  It is a compact, 7.5 inch barrel version of the classic AR-15 design, fitted with a shoulder brace instead of a buttstock.  It is 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",
+    "skill": "pistol",
+    "range": -6,
+    "ranged_damage": -16,
+    "dispersion": 380,
+    "durability": 7,
+    "min_cycle_recoil": 1350,
+    "barrel_length": 0,
+    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
   {
     "id": "h&k416a5",
     "copy-from": "rifle_auto",
@@ -325,6 +350,53 @@
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3rd burst", 3 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
+  {
+    "id": "oa93",
+    "copy-from": "rifle_semi",
+    "looks_like": "skorpion_61",
+    "type": "GUN",
+    "name": { "str": "OA-93" },
+    "description": "An AR-15 derivative AR pistol manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.",
+    "weight": "2023 g",
+    "volume": "2135 ml",
+    "price": 125000,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "range": -6,
+    "ranged_damage": -16,
+    "dispersion": 380,
+    "durability": 7,
+    "min_cycle_recoil": 1350,
+    "barrel_length": 0,
+    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
+  {
+    "id": "oa93_carbine",
+    "copy-from": "rifle_semi",
+    "looks_like": "skorpion_61",
+    "type": "GUN",
+    "name": { "str": "OA-93 carbine" },
+    "description": "An AR-15 derivative carbine manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.  This carbine version comes with built-in folding stock and longer barrel.",
+    "weight": "3402 g",
+    "volume": "3306 ml",
+    "price": 125000,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "dispersion": 150,
+    "durability": 7,
+    "min_cycle_recoil": 1350,
+    "built_in_mods": [ "folding_stock" ],
+    "barrel_length": "1000 ml",
+    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
   {
     "id": "rifle_223",
     "copy-from": "gun_base",

From de8aa93fad23c2352966be3300385bd0f33b527e Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 15:55:47 +0100
Subject: [PATCH 02/10] Added guns to item groups

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

diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
index 55a9bdee9a010..da1a404cae6a2 100644
--- a/data/json/itemgroups/guns.json
+++ b/data/json/itemgroups/guns.json
@@ -174,6 +174,7 @@
     "//": "Rifles commonly owned by citizens and found in many locations.",
     "items": [
       { "item": "browning_blr", "prob": 25, "charges-min": 0, "charges-max": 4 },
+      { "item": "db15", "prob": 20, "charges-min": 0, "charges-max": 30 },
       { "item": "garand", "prob": 65, "charges-min": 0, "charges-max": 8 },
       { "item": "ar10", "prob": 20, "charges-min": 0, "charges-max": 20 },
       { "item": "ar15", "prob": 30, "charges-min": 0, "charges-max": 30 },
@@ -215,6 +216,8 @@
       { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 20 },
       { "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 5 },
       { "item": "mosin91_30_ebr", "prob": 20, "charges-min": 0, "charges-max": 5 },
+      { "item": "oa93", "prob": 5, "charges-min": 0, "charges-max": 30 },
+      { "item": "oa93_carbine", "prob": 5, "charges-min": 0, "charges-max": 30 },
       { "item": "remington_700", "prob": 20, "charges-min": 0, "charges-max": 4 },
       { "item": "savage_111f", "prob": 15, "charges-min": 0, "charges-max": 3 },
       { "item": "sharps", "prob": 15, "charges-min": 0, "charges-max": 1 },
@@ -562,9 +565,12 @@
     "items": [
       { "group": "guns_improvised", "prob": 200 },
       { "item": "ar15", "prob": 5, "charges-min": 0, "charges-max": 30 },
+      { "item": "db15", "prob": 3, "charges-min": 0, "charges-max": 30 },
       { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 },
       { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 },
       { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 },
+      { "item": "oa93", "prob": 1, "charges-min": 0, "charges-max": 30 },
+      { "item": "oa93_carbine", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "shotgun_410", "prob": 10, "charges-min": 0, "charges-max": 1 },
       { "item": "shotgun_s", "prob": 10 },
       { "item": "shotgun_d", "prob": 10, "charges-min": 0, "charges-max": 2 },

From 92174fc238e91104236328a6ed5f80cc5b525261 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 16:01:34 +0100
Subject: [PATCH 03/10] Changed barrel_length to string

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

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 6597a5e69e9b8..ea0c1b72f13cc 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -67,7 +67,7 @@
     "dispersion": 380,
     "durability": 7,
     "min_cycle_recoil": 1350,
-    "barrel_length": 0,
+    "barrel_length": "0 ml",
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -371,7 +371,7 @@
     "dispersion": 380,
     "durability": 7,
     "min_cycle_recoil": 1350,
-    "barrel_length": 0,
+    "barrel_length": "0 ml",
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {

From 5125cab8d3cf399bbbf64608853a6ae84a44620f Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 16:04:12 +0100
Subject: [PATCH 04/10] Corrected description

---
 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 ea0c1b72f13cc..6fd1c89adc332 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -51,7 +51,7 @@
     "looks_like": "skorpion_61",
     "type": "GUN",
     "name": { "str": "DB-15" },
-    "description": "An AR-15 derivative AR pistol manufactured by Diamondback Firearms.  It is a compact, 7.5 inch barrel version of the classic AR-15 design, fitted with a shoulder brace instead of a buttstock.  It is commercially marketed as a home defense weapon.",
+    "description": "An AR-15 derivative AR pistol manufactured by Diamondback Firearms.  It is 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,

From ec0a88761d35c699e08aa5fbe4595c1aa0bba2fa Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 17:33:57 +0100
Subject: [PATCH 05/10] Changed wording

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

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 6fd1c89adc332..990816c7243cd 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -51,7 +51,7 @@
     "looks_like": "skorpion_61",
     "type": "GUN",
     "name": { "str": "DB-15" },
-    "description": "An AR-15 derivative AR pistol manufactured by Diamondback Firearms.  It is a compact, 7.5 inch barrel version of the classic AR-15 design, commercially marketed as a home defense weapon.",
+    "description": "An AR-15 derivative pistol manufactured by Diamondback Firearms.  It is 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,
@@ -356,7 +356,7 @@
     "looks_like": "skorpion_61",
     "type": "GUN",
     "name": { "str": "OA-93" },
-    "description": "An AR-15 derivative AR pistol manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.",
+    "description": "An AR-15 derivative pistol manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.",
     "weight": "2023 g",
     "volume": "2135 ml",
     "price": 125000,

From 55db039112fb40b9f17d20ba7b3930447afc2453 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 18:27:16 +0100
Subject: [PATCH 06/10] Added guns to Generic Guns

---
 data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index f9844efe202fd..31f2e9e1e99ae 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -264,6 +264,9 @@
       "arx160",
       "mosin91_30",
       "ar15",
+      "oa93",
+      "oa93_carbine",
+      "db15",
       "ruger_mini",
       "sig552",
       "steyr_aug",

From b8dc05582856de4e4276275e15cb34e0791731a6 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 19:32:22 +0100
Subject: [PATCH 07/10] Changed barrel_length to int

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

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 990816c7243cd..1ea52620136a1 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -67,7 +67,7 @@
     "dispersion": 380,
     "durability": 7,
     "min_cycle_recoil": 1350,
-    "barrel_length": "0 ml",
+    "barrel_length": 0,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -371,7 +371,7 @@
     "dispersion": 380,
     "durability": 7,
     "min_cycle_recoil": 1350,
-    "barrel_length": "0 ml",
+    "barrel_length": 0,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {

From 040415563014f9f352d4064e997d6efef4f0b68b Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Thu, 6 Feb 2020 23:09:57 +0100
Subject: [PATCH 08/10] Replaced DB-15 with a generic AR pistol

---
 data/json/itemgroups/guns.json                             | 4 ++--
 data/json/items/gun/223.json                               | 6 +++---
 data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
index da1a404cae6a2..3c4e61bb74d1b 100644
--- a/data/json/itemgroups/guns.json
+++ b/data/json/itemgroups/guns.json
@@ -174,7 +174,7 @@
     "//": "Rifles commonly owned by citizens and found in many locations.",
     "items": [
       { "item": "browning_blr", "prob": 25, "charges-min": 0, "charges-max": 4 },
-      { "item": "db15", "prob": 20, "charges-min": 0, "charges-max": 30 },
+      { "item": "ar_pistol", "prob": 20, "charges-min": 0, "charges-max": 30 },
       { "item": "garand", "prob": 65, "charges-min": 0, "charges-max": 8 },
       { "item": "ar10", "prob": 20, "charges-min": 0, "charges-max": 20 },
       { "item": "ar15", "prob": 30, "charges-min": 0, "charges-max": 30 },
@@ -565,7 +565,7 @@
     "items": [
       { "group": "guns_improvised", "prob": 200 },
       { "item": "ar15", "prob": 5, "charges-min": 0, "charges-max": 30 },
-      { "item": "db15", "prob": 3, "charges-min": 0, "charges-max": 30 },
+      { "item": "ar_pistol", "prob": 3, "charges-min": 0, "charges-max": 30 },
       { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 },
       { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 },
       { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 },
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 1ea52620136a1..d5f8d00d3ff20 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -46,12 +46,12 @@
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
-    "id": "db15",
+    "id": "ar_pistol",
     "copy-from": "rifle_semi",
     "looks_like": "skorpion_61",
     "type": "GUN",
-    "name": { "str": "DB-15" },
-    "description": "An AR-15 derivative pistol manufactured by Diamondback Firearms.  It is a compact, 7.5 inch barrel version of the classic AR-15 design, commercially marketed as a home defense weapon.",
+    "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,
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 31f2e9e1e99ae..e529b213bf645 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -266,7 +266,7 @@
       "ar15",
       "oa93",
       "oa93_carbine",
-      "db15",
+      "ar_pistol",
       "ruger_mini",
       "sig552",
       "steyr_aug",

From 2937674aecb2d354853b4754e46f88e3e567f356 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Sat, 8 Feb 2020 22:18:21 +0100
Subject: [PATCH 09/10] Requested changes, removed missed skill requirement
 from eariler

---
 data/json/itemgroups/guns.json                |  7 ++--
 data/json/items/gun/223.json                  | 32 +++----------------
 .../firearms/gg_firearms_migration.json       |  1 -
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
index 3c4e61bb74d1b..f179b5d58db6d 100644
--- a/data/json/itemgroups/guns.json
+++ b/data/json/itemgroups/guns.json
@@ -174,7 +174,7 @@
     "//": "Rifles commonly owned by citizens and found in many locations.",
     "items": [
       { "item": "browning_blr", "prob": 25, "charges-min": 0, "charges-max": 4 },
-      { "item": "ar_pistol", "prob": 20, "charges-min": 0, "charges-max": 30 },
+      { "item": "ar_pistol", "prob": 52, "charges-min": 0, "charges-max": 30 },
       { "item": "garand", "prob": 65, "charges-min": 0, "charges-max": 8 },
       { "item": "ar10", "prob": 20, "charges-min": 0, "charges-max": 20 },
       { "item": "ar15", "prob": 30, "charges-min": 0, "charges-max": 30 },
@@ -216,8 +216,6 @@
       { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 20 },
       { "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 5 },
       { "item": "mosin91_30_ebr", "prob": 20, "charges-min": 0, "charges-max": 5 },
-      { "item": "oa93", "prob": 5, "charges-min": 0, "charges-max": 30 },
-      { "item": "oa93_carbine", "prob": 5, "charges-min": 0, "charges-max": 30 },
       { "item": "remington_700", "prob": 20, "charges-min": 0, "charges-max": 4 },
       { "item": "savage_111f", "prob": 15, "charges-min": 0, "charges-max": 3 },
       { "item": "sharps", "prob": 15, "charges-min": 0, "charges-max": 1 },
@@ -277,6 +275,7 @@
       { "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
       { "item": "carbine_flintlock", "prob": 140 },
       { "item": "rifle_flintlock", "prob": 180 },
+      { "item": "oa93", "prob": 3, "charges-min": 0, "charges-max": 30 },
       { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "trex_gun", "prob": 60 },
       { "item": "arx160", "prob": 40, "charges-min": 0, "charges-max": 30 },
@@ -569,8 +568,6 @@
       { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 },
       { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 },
       { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 },
-      { "item": "oa93", "prob": 1, "charges-min": 0, "charges-max": 30 },
-      { "item": "oa93_carbine", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "shotgun_410", "prob": 10, "charges-min": 0, "charges-max": 1 },
       { "item": "shotgun_s", "prob": 10 },
       { "item": "shotgun_d", "prob": 10, "charges-min": 0, "charges-max": 2 },
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index d5f8d00d3ff20..ef7f5506984e8 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -61,11 +61,10 @@
     "symbol": "(",
     "color": "dark_gray",
     "ammo": "223",
-    "skill": "pistol",
     "range": -6,
-    "ranged_damage": -16,
+    "ranged_damage": -9,
     "dispersion": 380,
-    "durability": 7,
+    "durability": 6,
     "min_cycle_recoil": 1350,
     "barrel_length": 0,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
@@ -367,36 +366,13 @@
     "color": "dark_gray",
     "ammo": "223",
     "range": -6,
-    "ranged_damage": -16,
+    "ranged_damage": -11,
     "dispersion": 380,
-    "durability": 7,
+    "durability": 6,
     "min_cycle_recoil": 1350,
     "barrel_length": 0,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
-  {
-    "id": "oa93_carbine",
-    "copy-from": "rifle_semi",
-    "looks_like": "skorpion_61",
-    "type": "GUN",
-    "name": { "str": "OA-93 carbine" },
-    "description": "An AR-15 derivative carbine manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.  This carbine version comes with built-in folding stock and longer barrel.",
-    "weight": "3402 g",
-    "volume": "3306 ml",
-    "price": 125000,
-    "to_hit": -2,
-    "bashing": 9,
-    "material": [ "steel", "aluminum" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": "223",
-    "dispersion": 150,
-    "durability": 7,
-    "min_cycle_recoil": 1350,
-    "built_in_mods": [ "folding_stock" ],
-    "barrel_length": "1000 ml",
-    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
-  },
   {
     "id": "rifle_223",
     "copy-from": "gun_base",
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index e529b213bf645..47e6fdca398ea 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -265,7 +265,6 @@
       "mosin91_30",
       "ar15",
       "oa93",
-      "oa93_carbine",
       "ar_pistol",
       "ruger_mini",
       "sig552",

From cd4ba2ebaee4f2cb12ebbe9c3fe67e8c43a9e3cb Mon Sep 17 00:00:00 2001
From: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
Date: Tue, 10 Mar 2020 12:09:44 +0300
Subject: [PATCH 10/10] Rename data/json/itemgroups/guns.json to
 data/json/itemgroups/Weapons_Mods_Ammo/guns.json

---
 data/json/itemgroups/{ => Weapons_Mods_Ammo}/guns.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/json/itemgroups/{ => Weapons_Mods_Ammo}/guns.json (100%)

diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
similarity index 100%
rename from data/json/itemgroups/guns.json
rename to data/json/itemgroups/Weapons_Mods_Ammo/guns.json