Full gun revamp, part 4

7 files changed, 871 insertions, 433 deletions

diff --git a/guns/20x66mm.json b/guns/20x66mm.json
index cff9c7e..441c716 100644
--- a/guns/20x66mm.json
+++ b/guns/20x66mm.json
@@ -73,80 +73,6 @@
 			"guns/reload/shotgun/autoreload_5.ogg"
         ]
     },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "rm121aux",
-        "files" : [
-            "guns/20x66mm/20x66mm_1.ogg",
-			"guns/20x66mm/20x66mm_2.ogg",
-			"guns/20x66mm/20x66mm_3.ogg",
-			"guns/20x66mm/20x66mm_4.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "rm121aux",
-        "files" : [
-            "guns/20x66mm/20x66mm_1.ogg",
-			"guns/20x66mm/20x66mm_2.ogg",
-			"guns/20x66mm/20x66mm_3.ogg",
-			"guns/20x66mm/20x66mm_4.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 70,
-        "variant" : "rm121aux",
-        "files" : [
-            "guns/reload/shotgun/pumpreload1.ogg",
-			"guns/reload/shotgun/pumpreload2.ogg",
-			"guns/reload/shotgun/pumpreload3.ogg",
-			"guns/reload/shotgun/pumpreload4.ogg",
-			"guns/reload/shotgun/pumpreload5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "rm121aux_mod",
-        "files" : [
-            "guns/20x66mm/20x66mm_1.ogg",
-			"guns/20x66mm/20x66mm_2.ogg",
-			"guns/20x66mm/20x66mm_3.ogg",
-			"guns/20x66mm/20x66mm_4.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "rm121aux_mod",
-        "files" : [
-            "guns/20x66mm/20x66mm_1.ogg",
-			"guns/20x66mm/20x66mm_2.ogg",
-			"guns/20x66mm/20x66mm_3.ogg",
-			"guns/20x66mm/20x66mm_4.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 70,
-        "variant" : "rm121aux_mod",
-        "files" : [
-            "guns/reload/shotgun/pumpreload1.ogg",
-			"guns/reload/shotgun/pumpreload2.ogg",
-			"guns/reload/shotgun/pumpreload3.ogg",
-			"guns/reload/shotgun/pumpreload4.ogg",
-			"guns/reload/shotgun/pumpreload5.ogg"
-        ]
-    },
     {
         "type": "sound_effect",
         "id" : "fire_gun",
diff --git a/guns/20x66mm_mod.json b/guns/20x66mm_mod.json
new file mode 100644
index 0000000..e91762c
--- /dev/null
+++ b/guns/20x66mm_mod.json
@@ -0,0 +1,76 @@
+[
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "rm121aux",
+        "files" : [
+            "guns/20x66mm/20x66mm_1.ogg",
+			"guns/20x66mm/20x66mm_2.ogg",
+			"guns/20x66mm/20x66mm_3.ogg",
+			"guns/20x66mm/20x66mm_4.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "rm121aux",
+        "files" : [
+            "guns/20x66mm/20x66mm_1.ogg",
+			"guns/20x66mm/20x66mm_2.ogg",
+			"guns/20x66mm/20x66mm_3.ogg",
+			"guns/20x66mm/20x66mm_4.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 70,
+        "variant" : "rm121aux",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "rm121aux_mod",
+        "files" : [
+            "guns/20x66mm/20x66mm_1.ogg",
+			"guns/20x66mm/20x66mm_2.ogg",
+			"guns/20x66mm/20x66mm_3.ogg",
+			"guns/20x66mm/20x66mm_4.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "rm121aux_mod",
+        "files" : [
+            "guns/20x66mm/20x66mm_1.ogg",
+			"guns/20x66mm/20x66mm_2.ogg",
+			"guns/20x66mm/20x66mm_3.ogg",
+			"guns/20x66mm/20x66mm_4.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 70,
+        "variant" : "rm121aux_mod",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    }
+]
diff --git a/guns/40x46mm.json b/guns/40x46mm.json
index 34c6c67..1e2497b 100644
--- a/guns/40x46mm.json
+++ b/guns/40x46mm.json
@@ -81,45 +81,6 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "m320_mod",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "m320_mod",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "m320_mod",
-        "files" : [
-            "guns/reload/launcher/launcher_1.ogg",
-			"guns/reload/launcher/launcher_2.ogg",
-			"guns/reload/launcher/launcher_3.ogg",
-			"guns/reload/launcher/launcher_4.ogg",
-			"guns/reload/launcher/launcher_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
         "variant" : "m79",
         "files" : [
             "guns/40mm/40mm_1.ogg",
@@ -310,122 +271,5 @@
 			"guns/reload/launcher/launcher_4.ogg",
 			"guns/reload/launcher/launcher_5.ogg"
         ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "pipe_launcher40mm",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "pipe_launcher40mm",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "pipe_launcher40mm",
-        "files" : [
-            "guns/reload/launcher/launcher_1.ogg",
-			"guns/reload/launcher/launcher_2.ogg",
-			"guns/reload/launcher/launcher_3.ogg",
-			"guns/reload/launcher/launcher_4.ogg",
-			"guns/reload/launcher/launcher_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "m203",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "m203",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "m203",
-        "files" : [
-            "guns/reload/launcher/launcher_1.ogg",
-			"guns/reload/launcher/launcher_2.ogg",
-			"guns/reload/launcher/launcher_3.ogg",
-			"guns/reload/launcher/launcher_4.ogg",
-			"guns/reload/launcher/launcher_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "m203_mod",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "m203_mod",
-        "files" : [
-            "guns/40mm/40mm_1.ogg",
-			"guns/40mm/40mm_2.ogg",
-			"guns/40mm/40mm_3.ogg",
-			"guns/40mm/40mm_4.ogg",
-			"guns/40mm/40mm_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "m203_mod",
-        "files" : [
-            "guns/reload/launcher/launcher_1.ogg",
-			"guns/reload/launcher/launcher_2.ogg",
-			"guns/reload/launcher/launcher_3.ogg",
-			"guns/reload/launcher/launcher_4.ogg",
-			"guns/reload/launcher/launcher_5.ogg"
-        ]
     }
 ]
diff --git a/guns/40x46mm_mod.json b/guns/40x46mm_mod.json
new file mode 100644
index 0000000..c99731f
--- /dev/null
+++ b/guns/40x46mm_mod.json
@@ -0,0 +1,197 @@
+[
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "m203",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "m203",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "m203",
+        "files" : [
+            "guns/reload/launcher/launcher_1.ogg",
+			"guns/reload/launcher/launcher_2.ogg",
+			"guns/reload/launcher/launcher_3.ogg",
+			"guns/reload/launcher/launcher_4.ogg",
+			"guns/reload/launcher/launcher_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "m203_mod",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "m203_mod",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "m203_mod",
+        "files" : [
+            "guns/reload/launcher/launcher_1.ogg",
+			"guns/reload/launcher/launcher_2.ogg",
+			"guns/reload/launcher/launcher_3.ogg",
+			"guns/reload/launcher/launcher_4.ogg",
+			"guns/reload/launcher/launcher_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "m320_mod",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "m320_mod",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "m320_mod",
+        "files" : [
+            "guns/reload/launcher/launcher_1.ogg",
+			"guns/reload/launcher/launcher_2.ogg",
+			"guns/reload/launcher/launcher_3.ogg",
+			"guns/reload/launcher/launcher_4.ogg",
+			"guns/reload/launcher/launcher_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "m320_mod_mod",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "m320_mod_mod",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "m320_mod_mod",
+        "files" : [
+            "guns/reload/launcher/launcher_1.ogg",
+			"guns/reload/launcher/launcher_2.ogg",
+			"guns/reload/launcher/launcher_3.ogg",
+			"guns/reload/launcher/launcher_4.ogg",
+			"guns/reload/launcher/launcher_5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "pipe_launcher40mm",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "pipe_launcher40mm",
+        "files" : [
+            "guns/40mm/40mm_1.ogg",
+			"guns/40mm/40mm_2.ogg",
+			"guns/40mm/40mm_3.ogg",
+			"guns/40mm/40mm_4.ogg",
+			"guns/40mm/40mm_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "pipe_launcher40mm",
+        "files" : [
+            "guns/reload/launcher/launcher_1.ogg",
+			"guns/reload/launcher/launcher_2.ogg",
+			"guns/reload/launcher/launcher_3.ogg",
+			"guns/reload/launcher/launcher_4.ogg",
+			"guns/reload/launcher/launcher_5.ogg"
+        ]
+    }
+]
diff --git a/guns/combination.json b/guns/combination.json
new file mode 100644
index 0000000..c900b7b
--- /dev/null
+++ b/guns/combination.json
@@ -0,0 +1,81 @@
+[
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "combination_gun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "combination_gun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "combination_gun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "pipe_combination_gun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "pipe_combination_gun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "pipe_combination_gun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    }
+]
+
diff --git a/guns/shot.json b/guns/shot.json
index f83a1a3..4a0422f 100644
--- a/guns/shot.json
+++ b/guns/shot.json
@@ -1,9 +1,9 @@
 [
-    {
+	{
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "lemat_revolver_shotgun",
+        "variant" : "ashot",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -16,7 +16,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "lemat_revolver_shotgun",
+        "variant" : "ashot",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -29,7 +29,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "lemat_revolver_shotgun",
+        "variant" : "ashot",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -38,50 +38,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-	{
-        "type": "sound_effect",  
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "pipe_combination_gun",
-        "files" : [
-            "guns/shot/shot1.ogg",
-			"guns/shot/shot2.ogg",
-			"guns/shot/shot3.ogg",
-			"guns/shot/shot4.ogg",
-			"guns/shot/shot5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",  
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "pipe_combination_gun",
-        "files" : [
-            "guns/shot/shot1.ogg",
-			"guns/shot/shot2.ogg",
-			"guns/shot/shot3.ogg",
-			"guns/shot/shot4.ogg",
-			"guns/shot/shot5.ogg"
-        ]
-    },
     {
         "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "pipe_combination_gun",
-        "files" : [
-            "guns/reload/shotgun/pumpreload1.ogg",
-			"guns/reload/shotgun/pumpreload2.ogg",
-			"guns/reload/shotgun/pumpreload3.ogg",
-			"guns/reload/shotgun/pumpreload4.ogg",
-			"guns/reload/shotgun/pumpreload5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",  
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "masterkey",
+        "variant" : "bigun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -91,10 +52,10 @@
         ]
     },
 	{
-        "type": "sound_effect",  
+        "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "masterkey",
+        "variant" : "bigun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -107,7 +68,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "masterkey",
+        "variant" : "bigun",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -116,50 +77,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-	{
-        "type": "sound_effect",  
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "combination_gun",
-        "files" : [
-            "guns/shot/shot1.ogg",
-			"guns/shot/shot2.ogg",
-			"guns/shot/shot3.ogg",
-			"guns/shot/shot4.ogg",
-			"guns/shot/shot5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",  
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "combination_gun",
-        "files" : [
-            "guns/shot/shot1.ogg",
-			"guns/shot/shot2.ogg",
-			"guns/shot/shot3.ogg",
-			"guns/shot/shot4.ogg",
-			"guns/shot/shot5.ogg"
-        ]
-    },
     {
         "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "combination_gun",
-        "files" : [
-            "guns/reload/shotgun/pumpreload1.ogg",
-			"guns/reload/shotgun/pumpreload2.ogg",
-			"guns/reload/shotgun/pumpreload3.ogg",
-			"guns/reload/shotgun/pumpreload4.ogg",
-			"guns/reload/shotgun/pumpreload5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",  
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "combination_gun_shotgun",
+        "variant" : "browning_a5",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -169,10 +91,10 @@
         ]
     },
 	{
-        "type": "sound_effect",  
+        "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "combination_gun_shotgun",
+        "variant" : "browning_a5",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -185,7 +107,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "combination_gun_shotgun",
+        "variant" : "browning_a5",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -194,11 +116,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-	{
-        "type": "sound_effect",  
+    {
+        "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "combination_gun_shotgun_pipe",
+        "variant" : "ksg",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -208,10 +130,10 @@
         ]
     },
 	{
-        "type": "sound_effect",  
+        "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "combination_gun_shotgun_pipe",
+        "variant" : "ksg",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -224,7 +146,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "combination_gun_shotgun_pipe",
+        "variant" : "ksg",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -233,11 +155,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-	{
+    {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "ashot",
+        "variant" : "m1014",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -250,7 +172,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "ashot",
+        "variant" : "m1014",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -263,7 +185,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "ashot",
+        "variant" : "m1014",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -276,7 +198,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "bigun",
+        "variant" : "mossberg_500",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -289,7 +211,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "bigun",
+        "variant" : "mossberg_500",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -302,7 +224,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "bigun",
+        "variant" : "mossberg_500",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -315,7 +237,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "ksg",
+        "variant" : "mossberg_500_security",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -328,7 +250,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "ksg",
+        "variant" : "mossberg_500_security",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -341,7 +263,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "ksg",
+        "variant" : "mossberg_500_security",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -350,11 +272,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-	{
+    {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "ksg_aux_shotgun",
+        "variant" : "mossberg_590",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -367,7 +289,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "ksg_aux_shotgun",
+        "variant" : "mossberg_590",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -380,7 +302,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "ksg_aux_shotgun",
+        "variant" : "mossberg_590",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -393,7 +315,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "l_def_12",
+        "variant" : "mossberg_930",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -406,7 +328,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "l_def_12",
+        "variant" : "mossberg_930",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -419,7 +341,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "l_def_12",
+        "variant" : "mossberg_930",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -432,7 +354,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "m1014",
+        "variant" : "pipe_double_shotgun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -445,7 +367,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "m1014",
+        "variant" : "pipe_double_shotgun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -458,7 +380,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "m1014",
+        "variant" : "pipe_double_shotgun",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -471,7 +393,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "mossberg_500",
+        "variant" : "pipe_shotgun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -484,7 +406,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "mossberg_500",
+        "variant" : "pipe_shotgun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -497,7 +419,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "mossberg_500",
+        "variant" : "pipe_shotgun",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -510,33 +432,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "mossberg_500_security",
-        "files" : [
-            "guns/shot/shot1.ogg",
-			"guns/shot/shot2.ogg",
-			"guns/shot/shot3.ogg",
-			"guns/shot/shot4.ogg",
-			"guns/shot/shot5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "mossberg_500_security",
-        "files" : [
-            "guns/shot/shot1.ogg",
-			"guns/shot/shot2.ogg",
-			"guns/shot/shot3.ogg",
-			"guns/shot/shot4.ogg",
-			"guns/shot/shot5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "mossberg_590",
+        "variant" : "remington_870",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -549,7 +445,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "mossberg_590",
+        "variant" : "remington_870",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -562,20 +458,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "mossberg_590",
-        "files" : [
-            "guns/reload/shotgun/pumpreload1.ogg",
-			"guns/reload/shotgun/pumpreload2.ogg",
-			"guns/reload/shotgun/pumpreload3.ogg",
-			"guns/reload/shotgun/pumpreload4.ogg",
-			"guns/reload/shotgun/pumpreload5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "mossberg_500_security",
+        "variant" : "remington_870",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -588,7 +471,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "mossberg_930",
+        "variant" : "remington_870_breacher",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -601,7 +484,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "mossberg_930",
+        "variant" : "remington_870_breacher",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -614,7 +497,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "mossberg_930",
+        "variant" : "remington_870_breacher",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -627,7 +510,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "pipe_double_shotgun",
+        "variant" : "remington_870_express",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -640,7 +523,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "pipe_double_shotgun",
+        "variant" : "remington_870_express",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -653,7 +536,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "pipe_double_shotgun",
+        "variant" : "remington_870_express",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -666,7 +549,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "pipe_shotgun",
+        "variant" : "remington_1100",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -679,7 +562,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "pipe_shotgun",
+        "variant" : "remington_1100",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -692,7 +575,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "pipe_shotgun",
+        "variant" : "remington_1100",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -705,7 +588,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "remington_870",
+        "variant" : "revolver_shotgun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -718,7 +601,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "remington_870",
+        "variant" : "revolver_shotgun",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -731,7 +614,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "remington_870",
+        "variant" : "revolver_shotgun",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -744,7 +627,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "remington_870_breacher",
+        "variant" : "saiga_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -757,7 +640,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "remington_870_breacher",
+        "variant" : "saiga_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -770,7 +653,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "remington_870_breacher",
+        "variant" : "saiga_12",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -783,7 +666,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "remington_870_express",
+        "variant" : "shotgun_d",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -796,7 +679,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "remington_870_express",
+        "variant" : "shotgun_d",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -809,7 +692,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "remington_870_express",
+        "variant" : "shotgun_d",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -822,7 +705,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "revolver_shotgun",
+        "variant" : "shotgun_s",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -835,7 +718,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "revolver_shotgun",
+        "variant" : "shotgun_s",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -848,7 +731,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "revolver_shotgun",
+        "variant" : "shotgun_s",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -861,7 +744,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "saiga_12",
+        "variant" : "streetsweeper",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -874,7 +757,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "saiga_12",
+        "variant" : "streetsweeper",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -887,7 +770,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "saiga_12",
+        "variant" : "streetsweeper",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -900,7 +783,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "shotgun_d",
+        "variant" : "SPAS_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -913,7 +796,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "shotgun_d",
+        "variant" : "SPAS_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -926,7 +809,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "shotgun_d",
+        "variant" : "SPAS_12",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -939,7 +822,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "shotgun_s",
+        "variant" : "tavor_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -952,7 +835,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "shotgun_s",
+        "variant" : "tavor_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -965,7 +848,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "shotgun_s",
+        "variant" : "tavor_12",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -974,11 +857,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-	{
+   {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "u_shotgun",
+        "variant" : "USAS_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -991,7 +874,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "u_shotgun",
+        "variant" : "USAS_12",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -1004,7 +887,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "u_shotgun",
+        "variant" : "USAS_12",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -1013,11 +896,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-    {
+   {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "surv_levershotgun",
+        "variant" : "winchester_1887",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -1030,7 +913,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "surv_levershotgun",
+        "variant" : "winchester_1887",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -1043,7 +926,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "surv_levershotgun",
+        "variant" : "winchester_1887",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
@@ -1052,11 +935,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-    {
+   {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "browning_a5",
+        "variant" : "winchester_1897",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -1069,7 +952,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "browning_a5",
+        "variant" : "winchester_1897",
         "files" : [
             "guns/shot/shot1.ogg",
 			"guns/shot/shot2.ogg",
@@ -1082,7 +965,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "browning_a5",
+        "variant" : "winchester_1897",
         "files" : [
             "guns/reload/shotgun/pumpreload1.ogg",
 			"guns/reload/shotgun/pumpreload2.ogg",
diff --git a/guns/shot_mod.json b/guns/shot_mod.json
new file mode 100644
index 0000000..ae56105
--- /dev/null
+++ b/guns/shot_mod.json
@@ -0,0 +1,431 @@
+[
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "combination_gun_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "combination_gun_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "combination_gun_shotgun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "combination_gun_shotgun_pipe",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "combination_gun_shotgun_pipe",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "combination_gun_shotgun_pipe",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "ksg_aux_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "ksg_aux_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "ksg_aux_shotgun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "ts12_aux_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "ts12_aux_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "ts12_aux_shotgun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "ts12_aux_shotgun2",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "ts12_aux_shotgun2",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "ts12_aux_shotgun2",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "lemat_revolver_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "lemat_revolver_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "lemat_revolver_shotgun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "M6_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "M6_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "M6_shotgun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "masterkey",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "masterkey",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "masterkey",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "masterkey_mod",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",  
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "masterkey_mod",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "masterkey_mod",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "u_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "u_shotgun",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "u_shotgun",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "u_shotgun_mod",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "u_shotgun_mod",
+        "files" : [
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "u_shotgun_mod",
+        "files" : [
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
+        ]
+    }
+]