diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 928fff488..2af16744d 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -671,6 +671,11 @@ ENABLE_SSA = FALSE
VOLUME_SSA = 100
DEBUG_SSA = FALSE
+;------------------------------------------------------------------------------------------------------------------------------
+; New weapon sound system
+;------------------------------------------------------------------------------------------------------------------------------
+NWSS = FALSE
+
;******************************************************************************************************************************
;******************************************************************************************************************************
diff --git a/gamedir/Data-1.13/TableData/Items/AmmoStrings.xml b/gamedir/Data-1.13/TableData/Items/AmmoStrings.xml
index 1e2c8e5b6..612718cb3 100644
--- a/gamedir/Data-1.13/TableData/Items/AmmoStrings.xml
+++ b/gamedir/Data-1.13/TableData/Items/AmmoStrings.xml
@@ -9,61 +9,73 @@
1
.38 Spc
.38 Spc
+ .38 Spc
2
9x19mm
9x19mm
+ 9x19mm
3
.45 ACP
.45 ACP
+ .45 ACP
4
.357 Mag
.357 Mag
+ .357 Mag
5
12 gauge
12 gauge
+ 12 gauge
6
CAWS
CAWS
+ CAWS
7
5.45x39mm
5.45x39mm
+ 5.45x39mm
8
5.56x45mm
5.56x45mm
+ 5.56x45mm
9
7.62x51mm
7.62x51mm
+ 7.62x51mm
10
7.62x39mm
7.62x39mm
+ 7.62x39mm
11
4.7x33mm
4.7x33mm
+ 4.7x33mm
12
5.7x28mm
5.7x28mm
+ 5.7x28mm
13
@@ -89,71 +101,85 @@
17
.50 BMG
.50 BMG
+ .50 BMG
18
9x39mm
9x39mm
+ 9x39mm
19
4.6x30mm
4.6x30mm
+ 4.6x30mm
20
7.62x25mm
7.62x25mm
+ 7.62x25mm
21
12.7x108mm
12.7x108mm
+ 12.7x108mm
22
9x18mm
9x18mm
+ 9x18mm
23
.40 S&W
.40 S&W
+ .40 S&W
24
7.62x54mmR
7.62x54mmR
+ 7.62x54mmR
25
.338 Lapua
.338 LM
+ .338 Lapua
26
.44 Mag
.44 Mag
+ .44 Mag
27
10x25mm
10x25mm
+ 10x25mm
28
12.3x50mm
12.3x50mm
+ 12.3x50mm
29
9x21mm
9x21mm
+ 9x21mm
30
7.62x37mm
7.62x37mm
+ 7.62x37mm
31
@@ -169,76 +195,91 @@
33
5.45x18mm
5.45x18mm
+ 5.45x18mm
34
9mm MS
9mm MS
+ 9mm MS
35
.50 AE
.50 AE
+ .50 AE
36
.454 Casull
.454 Casull
+ .454 Casull
37
.45 WinMag
.45 WinMag
+ .45 WinMag
38
.50 Beowulf
.50 Beowulf
+ .50 Beowulf
39
.300 WinMag
.300 WinMag
+ .300 WinMag
40
7.92x57mm
7.92x57mm
+ 7.92x57mm
41
12.7x97mm Subsonic
12.7x97mm
+ 12.7x97mm Subsonic
42
6.8x43mm SPC
6.8x43mm
+ 6.8x43mm SPC
43
5.56x45mm SCF
5.56mm SCF
+ 5.56x45mm SCF
44
.41 AE
.41 AE
+ .41 AE
45
.30 car
.30 car
+ .30 car
46
.30-06
.30-06
+ .30-06
47
6x35mm
6x35mm
+ 6x35mm
48
diff --git a/gamedir/Data-1.13/TableData/Items/Weapons.xml b/gamedir/Data-1.13/TableData/Items/Weapons.xml
index bd9621d75..de7cf095f 100644
--- a/gamedir/Data-1.13/TableData/Items/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Items/Weapons.xml
@@ -550,6 +550,7 @@
8
4
8
+ HK53
40000
12600
113
diff --git a/gamedir/Data/AltSounds/Caliber/.30 car/case1.ogg b/gamedir/Data/AltSounds/Caliber/.30 car/case1.ogg
new file mode 100644
index 000000000..ac665f7a0
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30 car/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30 car/case2.ogg b/gamedir/Data/AltSounds/Caliber/.30 car/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30 car/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30 car/loop.ogg b/gamedir/Data/AltSounds/Caliber/.30 car/loop.ogg
new file mode 100644
index 000000000..5531aabef
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30 car/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30 car/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.30 car/loop_s.ogg
new file mode 100644
index 000000000..423e07399
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30 car/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30 car/rifle_single.ogg b/gamedir/Data/AltSounds/Caliber/.30 car/rifle_single.ogg
new file mode 100644
index 000000000..2b45bc8e2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30 car/rifle_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30-06/case1.ogg b/gamedir/Data/AltSounds/Caliber/.30-06/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30-06/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30-06/case2.ogg b/gamedir/Data/AltSounds/Caliber/.30-06/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30-06/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30-06/empty.ogg b/gamedir/Data/AltSounds/Caliber/.30-06/empty.ogg
new file mode 100644
index 000000000..5c61a2311
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30-06/empty.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30-06/loop.ogg b/gamedir/Data/AltSounds/Caliber/.30-06/loop.ogg
new file mode 100644
index 000000000..b56da0805
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30-06/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30-06/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.30-06/loop_s.ogg
new file mode 100644
index 000000000..861655520
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30-06/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30-06/rifle_single.ogg b/gamedir/Data/AltSounds/Caliber/.30-06/rifle_single.ogg
new file mode 100644
index 000000000..cf3c586ba
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30-06/rifle_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.30-06/single.ogg b/gamedir/Data/AltSounds/Caliber/.30-06/single.ogg
new file mode 100644
index 000000000..b21a041aa
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.30-06/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 Whisper/case1.ogg b/gamedir/Data/AltSounds/Caliber/.300 Whisper/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 Whisper/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 Whisper/case2.ogg b/gamedir/Data/AltSounds/Caliber/.300 Whisper/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 Whisper/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 Whisper/loop.ogg b/gamedir/Data/AltSounds/Caliber/.300 Whisper/loop.ogg
new file mode 100644
index 000000000..17767e5f4
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 Whisper/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 Whisper/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.300 Whisper/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 Whisper/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 WinMag/case1.ogg b/gamedir/Data/AltSounds/Caliber/.300 WinMag/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 WinMag/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 WinMag/case2.ogg b/gamedir/Data/AltSounds/Caliber/.300 WinMag/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 WinMag/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 WinMag/loop.ogg b/gamedir/Data/AltSounds/Caliber/.300 WinMag/loop.ogg
new file mode 100644
index 000000000..54bc145a2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 WinMag/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.300 WinMag/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.300 WinMag/loop_s.ogg
new file mode 100644
index 000000000..89daf549a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.300 WinMag/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.338 Lapua/case1.ogg b/gamedir/Data/AltSounds/Caliber/.338 Lapua/case1.ogg
new file mode 100644
index 000000000..308301dc6
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.338 Lapua/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.338 Lapua/case2.ogg b/gamedir/Data/AltSounds/Caliber/.338 Lapua/case2.ogg
new file mode 100644
index 000000000..e5ba5b5db
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.338 Lapua/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.338 Lapua/loop.ogg b/gamedir/Data/AltSounds/Caliber/.338 Lapua/loop.ogg
new file mode 100644
index 000000000..12741256e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.338 Lapua/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.338 Lapua/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.338 Lapua/loop_s.ogg
new file mode 100644
index 000000000..89daf549a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.338 Lapua/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.338 Lapua/single_noecho.ogg b/gamedir/Data/AltSounds/Caliber/.338 Lapua/single_noecho.ogg
new file mode 100644
index 000000000..972408af8
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.338 Lapua/single_noecho.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.357 Mag/case1.ogg b/gamedir/Data/AltSounds/Caliber/.357 Mag/case1.ogg
new file mode 100644
index 000000000..614bafe6c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.357 Mag/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.357 Mag/case2.ogg b/gamedir/Data/AltSounds/Caliber/.357 Mag/case2.ogg
new file mode 100644
index 000000000..a7ee8edab
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.357 Mag/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.357 Mag/loop.ogg b/gamedir/Data/AltSounds/Caliber/.357 Mag/loop.ogg
new file mode 100644
index 000000000..1d7cf4683
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.357 Mag/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.357 Mag/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.357 Mag/loop_s.ogg
new file mode 100644
index 000000000..9e2a69108
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.357 Mag/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.357 Mag/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/.357 Mag/pistol_single.ogg
new file mode 100644
index 000000000..8fcda227b
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.357 Mag/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.38 Spc/case1.ogg b/gamedir/Data/AltSounds/Caliber/.38 Spc/case1.ogg
new file mode 100644
index 000000000..614bafe6c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.38 Spc/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.38 Spc/case2.ogg b/gamedir/Data/AltSounds/Caliber/.38 Spc/case2.ogg
new file mode 100644
index 000000000..a7ee8edab
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.38 Spc/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.38 Spc/loop.ogg b/gamedir/Data/AltSounds/Caliber/.38 Spc/loop.ogg
new file mode 100644
index 000000000..0cfbe6dbe
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.38 Spc/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.38 Spc/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.38 Spc/loop_s.ogg
new file mode 100644
index 000000000..9e2a69108
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.38 Spc/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.38 Spc/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/.38 Spc/pistol_single.ogg
new file mode 100644
index 000000000..3693863f2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.38 Spc/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.40 S&W/case1.ogg b/gamedir/Data/AltSounds/Caliber/.40 S&W/case1.ogg
new file mode 100644
index 000000000..614bafe6c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.40 S&W/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.40 S&W/case2.ogg b/gamedir/Data/AltSounds/Caliber/.40 S&W/case2.ogg
new file mode 100644
index 000000000..a7ee8edab
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.40 S&W/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.40 S&W/loop.ogg b/gamedir/Data/AltSounds/Caliber/.40 S&W/loop.ogg
new file mode 100644
index 000000000..37f162633
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.40 S&W/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.40 S&W/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.40 S&W/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.40 S&W/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.40 S&W/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/.40 S&W/pistol_single.ogg
new file mode 100644
index 000000000..6db8dd4ce
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.40 S&W/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.41 AE/case1.ogg b/gamedir/Data/AltSounds/Caliber/.41 AE/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.41 AE/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.41 AE/case2.ogg b/gamedir/Data/AltSounds/Caliber/.41 AE/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.41 AE/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.41 AE/loop.ogg b/gamedir/Data/AltSounds/Caliber/.41 AE/loop.ogg
new file mode 100644
index 000000000..73f238451
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.41 AE/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.41 AE/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.41 AE/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.41 AE/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.44 Mag/case1.ogg b/gamedir/Data/AltSounds/Caliber/.44 Mag/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.44 Mag/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.44 Mag/case2.ogg b/gamedir/Data/AltSounds/Caliber/.44 Mag/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.44 Mag/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.44 Mag/loop.ogg b/gamedir/Data/AltSounds/Caliber/.44 Mag/loop.ogg
new file mode 100644
index 000000000..db70f804e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.44 Mag/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.44 Mag/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.44 Mag/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.44 Mag/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.44 Mag/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/.44 Mag/pistol_single.ogg
new file mode 100644
index 000000000..db70f804e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.44 Mag/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.44 Mag/rifle_single.ogg b/gamedir/Data/AltSounds/Caliber/.44 Mag/rifle_single.ogg
new file mode 100644
index 000000000..25702595d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.44 Mag/rifle_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 ACP/case1.ogg b/gamedir/Data/AltSounds/Caliber/.45 ACP/case1.ogg
new file mode 100644
index 000000000..614bafe6c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 ACP/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 ACP/case2.ogg b/gamedir/Data/AltSounds/Caliber/.45 ACP/case2.ogg
new file mode 100644
index 000000000..a7ee8edab
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 ACP/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 ACP/loop.ogg b/gamedir/Data/AltSounds/Caliber/.45 ACP/loop.ogg
new file mode 100644
index 000000000..73b26c1b1
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 ACP/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 ACP/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.45 ACP/loop_s.ogg
new file mode 100644
index 000000000..c2744b2cb
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 ACP/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 ACP/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/.45 ACP/pistol_single.ogg
new file mode 100644
index 000000000..6d3b9b6d2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 ACP/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 ACP/rifle_single.ogg b/gamedir/Data/AltSounds/Caliber/.45 ACP/rifle_single.ogg
new file mode 100644
index 000000000..37188fb1b
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 ACP/rifle_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 ACP/smg_loop.ogg b/gamedir/Data/AltSounds/Caliber/.45 ACP/smg_loop.ogg
new file mode 100644
index 000000000..c863cb6e4
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 ACP/smg_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 WinMag/case1.ogg b/gamedir/Data/AltSounds/Caliber/.45 WinMag/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 WinMag/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 WinMag/case2.ogg b/gamedir/Data/AltSounds/Caliber/.45 WinMag/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 WinMag/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 WinMag/loop.ogg b/gamedir/Data/AltSounds/Caliber/.45 WinMag/loop.ogg
new file mode 100644
index 000000000..a994e9c79
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 WinMag/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.45 WinMag/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.45 WinMag/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.45 WinMag/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.454 Casull/case1.ogg b/gamedir/Data/AltSounds/Caliber/.454 Casull/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.454 Casull/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.454 Casull/case2.ogg b/gamedir/Data/AltSounds/Caliber/.454 Casull/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.454 Casull/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.454 Casull/loop.ogg b/gamedir/Data/AltSounds/Caliber/.454 Casull/loop.ogg
new file mode 100644
index 000000000..95193da49
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.454 Casull/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.454 Casull/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.454 Casull/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.454 Casull/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.454 Casull/single.ogg b/gamedir/Data/AltSounds/Caliber/.454 Casull/single.ogg
new file mode 100644
index 000000000..de2633d3b
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.454 Casull/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 AE/case1.ogg b/gamedir/Data/AltSounds/Caliber/.50 AE/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 AE/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 AE/case2.ogg b/gamedir/Data/AltSounds/Caliber/.50 AE/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 AE/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 AE/loop.ogg b/gamedir/Data/AltSounds/Caliber/.50 AE/loop.ogg
new file mode 100644
index 000000000..a14c0bbe7
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 AE/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 AE/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.50 AE/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 AE/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 AE/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/.50 AE/pistol_single.ogg
new file mode 100644
index 000000000..30064ff34
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 AE/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 BMG/case1.ogg b/gamedir/Data/AltSounds/Caliber/.50 BMG/case1.ogg
new file mode 100644
index 000000000..308301dc6
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 BMG/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 BMG/case2.ogg b/gamedir/Data/AltSounds/Caliber/.50 BMG/case2.ogg
new file mode 100644
index 000000000..e5ba5b5db
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 BMG/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 BMG/loop.ogg b/gamedir/Data/AltSounds/Caliber/.50 BMG/loop.ogg
new file mode 100644
index 000000000..ca579d682
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 BMG/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 BMG/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.50 BMG/loop_s.ogg
new file mode 100644
index 000000000..3af53442b
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 BMG/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 BMG/rifle_single_noecho.ogg b/gamedir/Data/AltSounds/Caliber/.50 BMG/rifle_single_noecho.ogg
new file mode 100644
index 000000000..3e8e3d915
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 BMG/rifle_single_noecho.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 BMG/single_noecho.ogg b/gamedir/Data/AltSounds/Caliber/.50 BMG/single_noecho.ogg
new file mode 100644
index 000000000..93323bfba
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 BMG/single_noecho.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 BMG/sniper_single_noecho.ogg b/gamedir/Data/AltSounds/Caliber/.50 BMG/sniper_single_noecho.ogg
new file mode 100644
index 000000000..b95b3b870
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 BMG/sniper_single_noecho.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 Beowulf/case1.ogg b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 Beowulf/case2.ogg b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 Beowulf/loop.ogg b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/loop.ogg
new file mode 100644
index 000000000..3c7aee9a5
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 Beowulf/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/loop_s.ogg
new file mode 100644
index 000000000..cfac53d84
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/.50 Beowulf/single.ogg b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/single.ogg
new file mode 100644
index 000000000..1a23665df
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/.50 Beowulf/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/10x25mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/10x25mm/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/10x25mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/10x25mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/10x25mm/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/10x25mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/10x25mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/10x25mm/loop.ogg
new file mode 100644
index 000000000..a23921718
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/10x25mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/10x25mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/10x25mm/loop_s.ogg
new file mode 100644
index 000000000..6cefb98da
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/10x25mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/10x25mm/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/10x25mm/pistol_single.ogg
new file mode 100644
index 000000000..9b48a3be5
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/10x25mm/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12 gauge/case1.ogg b/gamedir/Data/AltSounds/Caliber/12 gauge/case1.ogg
new file mode 100644
index 000000000..563fb7e8a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12 gauge/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12 gauge/case2.ogg b/gamedir/Data/AltSounds/Caliber/12 gauge/case2.ogg
new file mode 100644
index 000000000..7470deaf2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12 gauge/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12 gauge/loop.ogg b/gamedir/Data/AltSounds/Caliber/12 gauge/loop.ogg
new file mode 100644
index 000000000..749e5bf96
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12 gauge/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12 gauge/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/12 gauge/loop_s.ogg
new file mode 100644
index 000000000..676c556ed
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12 gauge/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12 gauge/room.ogg b/gamedir/Data/AltSounds/Caliber/12 gauge/room.ogg
new file mode 100644
index 000000000..3adb23977
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12 gauge/room.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12 gauge/shotgun_single.ogg b/gamedir/Data/AltSounds/Caliber/12 gauge/shotgun_single.ogg
new file mode 100644
index 000000000..46337f55b
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12 gauge/shotgun_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12 gauge/single.ogg b/gamedir/Data/AltSounds/Caliber/12 gauge/single.ogg
new file mode 100644
index 000000000..55e2334b9
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12 gauge/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.3x50mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/12.3x50mm/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.3x50mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.3x50mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/12.3x50mm/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.3x50mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.3x50mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/12.3x50mm/loop.ogg
new file mode 100644
index 000000000..95193da49
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.3x50mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.3x50mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/12.3x50mm/loop_s.ogg
new file mode 100644
index 000000000..cfac53d84
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.3x50mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x108mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/12.7x108mm/case1.ogg
new file mode 100644
index 000000000..308301dc6
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x108mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x108mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/12.7x108mm/case2.ogg
new file mode 100644
index 000000000..e5ba5b5db
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x108mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x108mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/12.7x108mm/loop.ogg
new file mode 100644
index 000000000..8f87551d2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x108mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x108mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/12.7x108mm/loop_s.ogg
new file mode 100644
index 000000000..3af53442b
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x108mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x108mm/single.ogg b/gamedir/Data/AltSounds/Caliber/12.7x108mm/single.ogg
new file mode 100644
index 000000000..fe27fd673
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x108mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/case1.ogg b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/case2.ogg b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/loop.ogg b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/loop.ogg
new file mode 100644
index 000000000..a14c0bbe7
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/loop_s.ogg
new file mode 100644
index 000000000..cfac53d84
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x55mm Sub/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/case1.ogg b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/case1.ogg
new file mode 100644
index 000000000..308301dc6
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/case2.ogg b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/case2.ogg
new file mode 100644
index 000000000..e5ba5b5db
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/loop.ogg b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/loop.ogg
new file mode 100644
index 000000000..875c362dc
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/loop_s.ogg
new file mode 100644
index 000000000..861655520
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/12.7x97mm Subsonic/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.6x30mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/4.6x30mm/case1.ogg
new file mode 100644
index 000000000..3adb23977
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.6x30mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.6x30mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/4.6x30mm/case2.ogg
new file mode 100644
index 000000000..3adb23977
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.6x30mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.6x30mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/4.6x30mm/loop.ogg
new file mode 100644
index 000000000..ffba526cd
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.6x30mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.6x30mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/4.6x30mm/loop_s.ogg
new file mode 100644
index 000000000..8ced03f5c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.6x30mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.6x30mm/single.ogg b/gamedir/Data/AltSounds/Caliber/4.6x30mm/single.ogg
new file mode 100644
index 000000000..2ad6b31a7
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.6x30mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.7x33mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/4.7x33mm/case1.ogg
new file mode 100644
index 000000000..b2a0733af
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.7x33mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.7x33mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/4.7x33mm/case2.ogg
new file mode 100644
index 000000000..fe74116e8
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.7x33mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.7x33mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/4.7x33mm/loop.ogg
new file mode 100644
index 000000000..5007520df
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.7x33mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.7x33mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/4.7x33mm/loop_s.ogg
new file mode 100644
index 000000000..8ced03f5c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.7x33mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.7x33mm/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/4.7x33mm/pistol_single.ogg
new file mode 100644
index 000000000..811ba1b65
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.7x33mm/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/4.7x33mm/single.ogg b/gamedir/Data/AltSounds/Caliber/4.7x33mm/single.ogg
new file mode 100644
index 000000000..a41b4a4f9
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/4.7x33mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x18mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/5.45x18mm/case1.ogg
new file mode 100644
index 000000000..614bafe6c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x18mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x18mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/5.45x18mm/case2.ogg
new file mode 100644
index 000000000..a7ee8edab
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x18mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x18mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/5.45x18mm/loop.ogg
new file mode 100644
index 000000000..0d8c06f89
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x18mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x18mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/5.45x18mm/loop_s.ogg
new file mode 100644
index 000000000..8ced03f5c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x18mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x39mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/5.45x39mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x39mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x39mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/5.45x39mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x39mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x39mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/5.45x39mm/loop.ogg
new file mode 100644
index 000000000..a0c76714e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x39mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x39mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/5.45x39mm/loop_s.ogg
new file mode 100644
index 000000000..cb291fce0
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x39mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.45x39mm/single.ogg b/gamedir/Data/AltSounds/Caliber/5.45x39mm/single.ogg
new file mode 100644
index 000000000..07e130faa
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.45x39mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/case1.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/case2.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/loop.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/loop.ogg
new file mode 100644
index 000000000..ff2e4c20c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/loop_s.ogg
new file mode 100644
index 000000000..861655520
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm SCF/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/HK53_loop.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/HK53_loop.ogg
new file mode 100644
index 000000000..bbd961add
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/HK53_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/HK53_single.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/HK53_single.ogg
new file mode 100644
index 000000000..bbd961add
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/HK53_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/loop.ogg
new file mode 100644
index 000000000..c00c403aa
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/loop_s.ogg
new file mode 100644
index 000000000..894ed62c7
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/rifle_single.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/rifle_single.ogg
new file mode 100644
index 000000000..e8cbf23bb
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/rifle_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.56x45mm/single.ogg b/gamedir/Data/AltSounds/Caliber/5.56x45mm/single.ogg
new file mode 100644
index 000000000..e25c8c4ef
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.56x45mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.7x28mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/5.7x28mm/case1.ogg
new file mode 100644
index 000000000..b2a0733af
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.7x28mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.7x28mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/5.7x28mm/case2.ogg
new file mode 100644
index 000000000..fe74116e8
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.7x28mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.7x28mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/5.7x28mm/loop.ogg
new file mode 100644
index 000000000..13b146065
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.7x28mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.7x28mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/5.7x28mm/loop_s.ogg
new file mode 100644
index 000000000..872ea64c4
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.7x28mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.7x28mm/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/5.7x28mm/pistol_single.ogg
new file mode 100644
index 000000000..6016a0445
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.7x28mm/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/5.7x28mm/single.ogg b/gamedir/Data/AltSounds/Caliber/5.7x28mm/single.ogg
new file mode 100644
index 000000000..99bb74c2e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/5.7x28mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.5x38mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/6.5x38mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.5x38mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.5x38mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/6.5x38mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.5x38mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.5x38mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/6.5x38mm/loop.ogg
new file mode 100644
index 000000000..75e011ec1
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.5x38mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.5x38mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/6.5x38mm/loop_s.ogg
new file mode 100644
index 000000000..861655520
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.5x38mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/case1.ogg b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/case2.ogg b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/loop.ogg b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/loop.ogg
new file mode 100644
index 000000000..75e011ec1
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/loop_s.ogg
new file mode 100644
index 000000000..861655520
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6.8x43mm SPC/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6x35mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/6x35mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6x35mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6x35mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/6x35mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6x35mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6x35mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/6x35mm/loop.ogg
new file mode 100644
index 000000000..75e011ec1
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6x35mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/6x35mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/6x35mm/loop_s.ogg
new file mode 100644
index 000000000..861655520
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/6x35mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x25mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/7.62x25mm/case1.ogg
new file mode 100644
index 000000000..614bafe6c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x25mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x25mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/7.62x25mm/case2.ogg
new file mode 100644
index 000000000..a7ee8edab
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x25mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x25mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x25mm/loop.ogg
new file mode 100644
index 000000000..b4c974ce5
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x25mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x25mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/7.62x25mm/loop_s.ogg
new file mode 100644
index 000000000..b1f61b8d8
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x25mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x25mm/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/7.62x25mm/pistol_single.ogg
new file mode 100644
index 000000000..b4c974ce5
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x25mm/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x35mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/7.62x35mm/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x35mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x35mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/7.62x35mm/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x35mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x35mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x35mm/loop.ogg
new file mode 100644
index 000000000..6f2274bf0
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x35mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x35mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/7.62x35mm/loop_s.ogg
new file mode 100644
index 000000000..38d3c227a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x35mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x37mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/7.62x37mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x37mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x37mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/7.62x37mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x37mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x37mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x37mm/loop.ogg
new file mode 100644
index 000000000..6f2274bf0
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x37mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x37mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/7.62x37mm/loop_s.ogg
new file mode 100644
index 000000000..861655520
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x37mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x39mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/7.62x39mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x39mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x39mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/7.62x39mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x39mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x39mm/lmg_loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x39mm/lmg_loop.ogg
new file mode 100644
index 000000000..cdff73ecc
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x39mm/lmg_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x39mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x39mm/loop.ogg
new file mode 100644
index 000000000..3850c47ee
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x39mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x39mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/7.62x39mm/loop_s.ogg
new file mode 100644
index 000000000..626b00488
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x39mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x39mm/rifle_single.ogg b/gamedir/Data/AltSounds/Caliber/7.62x39mm/rifle_single.ogg
new file mode 100644
index 000000000..80e51994a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x39mm/rifle_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x39mm/single.ogg b/gamedir/Data/AltSounds/Caliber/7.62x39mm/single.ogg
new file mode 100644
index 000000000..51cde7e9c
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x39mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x51mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/7.62x51mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x51mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x51mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/7.62x51mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x51mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x51mm/lmg_loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x51mm/lmg_loop.ogg
new file mode 100644
index 000000000..15c991b05
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x51mm/lmg_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x51mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x51mm/loop.ogg
new file mode 100644
index 000000000..e6a282efa
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x51mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x51mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/7.62x51mm/loop_s.ogg
new file mode 100644
index 000000000..89daf549a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x51mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x51mm/single_noecho.ogg b/gamedir/Data/AltSounds/Caliber/7.62x51mm/single_noecho.ogg
new file mode 100644
index 000000000..232d0c78f
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x51mm/single_noecho.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x51mm/sniper_single_noecho.ogg b/gamedir/Data/AltSounds/Caliber/7.62x51mm/sniper_single_noecho.ogg
new file mode 100644
index 000000000..517add986
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x51mm/sniper_single_noecho.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x54mmR/case1.ogg b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x54mmR/case2.ogg b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x54mmR/lmg_loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/lmg_loop.ogg
new file mode 100644
index 000000000..aad23bf0a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/lmg_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x54mmR/loop.ogg b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/loop.ogg
new file mode 100644
index 000000000..c04a1615d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x54mmR/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/loop_s.ogg
new file mode 100644
index 000000000..89daf549a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.62x54mmR/single.ogg b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/single.ogg
new file mode 100644
index 000000000..0ea6317d2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.62x54mmR/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.92x57mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/7.92x57mm/case1.ogg
new file mode 100644
index 000000000..19ca27310
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.92x57mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.92x57mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/7.92x57mm/case2.ogg
new file mode 100644
index 000000000..7e18f5448
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.92x57mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.92x57mm/lmg_loop.ogg b/gamedir/Data/AltSounds/Caliber/7.92x57mm/lmg_loop.ogg
new file mode 100644
index 000000000..90133a0e5
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.92x57mm/lmg_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.92x57mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/7.92x57mm/loop.ogg
new file mode 100644
index 000000000..26b106a65
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.92x57mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.92x57mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/7.92x57mm/loop_s.ogg
new file mode 100644
index 000000000..89daf549a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.92x57mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/7.92x57mm/single.ogg b/gamedir/Data/AltSounds/Caliber/7.92x57mm/single.ogg
new file mode 100644
index 000000000..a89c186bd
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/7.92x57mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9mm MS/loop.ogg b/gamedir/Data/AltSounds/Caliber/9mm MS/loop.ogg
new file mode 100644
index 000000000..f43469d79
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9mm MS/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9mm MS/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/9mm MS/loop_s.ogg
new file mode 100644
index 000000000..6cd173f90
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9mm MS/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/case1.ogg
new file mode 100644
index 000000000..be60d5366
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/case2.ogg
new file mode 100644
index 000000000..71b0c90fe
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/empty.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/empty.ogg
new file mode 100644
index 000000000..9b6e6f585
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/empty.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/loop.ogg
new file mode 100644
index 000000000..d6d85de1d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/loop_s.ogg
new file mode 100644
index 000000000..9e2a69108
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/pistol_loop.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/pistol_loop.ogg
new file mode 100644
index 000000000..f38eca293
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/pistol_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/single.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/single.ogg
new file mode 100644
index 000000000..f38eca293
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x18mm/smg_loop.ogg b/gamedir/Data/AltSounds/Caliber/9x18mm/smg_loop.ogg
new file mode 100644
index 000000000..60f66074f
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x18mm/smg_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/case1.ogg
new file mode 100644
index 000000000..be60d5366
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/case2.ogg
new file mode 100644
index 000000000..71b0c90fe
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/empty.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/empty.ogg
new file mode 100644
index 000000000..ba02aa346
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/empty.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/loop.ogg
new file mode 100644
index 000000000..791931eca
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/loop_s.ogg
new file mode 100644
index 000000000..a1e820b55
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/pistol_loop.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/pistol_loop.ogg
new file mode 100644
index 000000000..79dca03ab
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/pistol_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/pistol_single.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/pistol_single.ogg
new file mode 100644
index 000000000..7b655bc69
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/pistol_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/rifle_loop.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/rifle_loop.ogg
new file mode 100644
index 000000000..c8fea741e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/rifle_loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x19mm/rifle_single.ogg b/gamedir/Data/AltSounds/Caliber/9x19mm/rifle_single.ogg
new file mode 100644
index 000000000..c8fea741e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x19mm/rifle_single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x21mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/9x21mm/case1.ogg
new file mode 100644
index 000000000..be60d5366
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x21mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x21mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/9x21mm/case2.ogg
new file mode 100644
index 000000000..71b0c90fe
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x21mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x21mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/9x21mm/loop.ogg
new file mode 100644
index 000000000..1d7cf4683
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x21mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x21mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/9x21mm/loop_s.ogg
new file mode 100644
index 000000000..9e2a69108
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x21mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x21mm/single.ogg b/gamedir/Data/AltSounds/Caliber/9x21mm/single.ogg
new file mode 100644
index 000000000..0c9658e95
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x21mm/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x39mm/AR_loop_s.ogg b/gamedir/Data/AltSounds/Caliber/9x39mm/AR_loop_s.ogg
new file mode 100644
index 000000000..aee3eb91e
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x39mm/AR_loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x39mm/case1.ogg b/gamedir/Data/AltSounds/Caliber/9x39mm/case1.ogg
new file mode 100644
index 000000000..37cc095b3
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x39mm/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x39mm/case2.ogg b/gamedir/Data/AltSounds/Caliber/9x39mm/case2.ogg
new file mode 100644
index 000000000..017e9134d
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x39mm/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x39mm/loop.ogg b/gamedir/Data/AltSounds/Caliber/9x39mm/loop.ogg
new file mode 100644
index 000000000..1d7cf4683
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x39mm/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/9x39mm/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/9x39mm/loop_s.ogg
new file mode 100644
index 000000000..68995ddad
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/9x39mm/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/CAWS/case1.ogg b/gamedir/Data/AltSounds/Caliber/CAWS/case1.ogg
new file mode 100644
index 000000000..563fb7e8a
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/CAWS/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/CAWS/case2.ogg b/gamedir/Data/AltSounds/Caliber/CAWS/case2.ogg
new file mode 100644
index 000000000..7470deaf2
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/CAWS/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/CAWS/loop.ogg b/gamedir/Data/AltSounds/Caliber/CAWS/loop.ogg
new file mode 100644
index 000000000..e85646f07
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/CAWS/loop.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/CAWS/loop_s.ogg b/gamedir/Data/AltSounds/Caliber/CAWS/loop_s.ogg
new file mode 100644
index 000000000..676c556ed
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/CAWS/loop_s.ogg differ
diff --git a/gamedir/Data/AltSounds/Caliber/CAWS/single.ogg b/gamedir/Data/AltSounds/Caliber/CAWS/single.ogg
new file mode 100644
index 000000000..e85646f07
Binary files /dev/null and b/gamedir/Data/AltSounds/Caliber/CAWS/single.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/case1.ogg b/gamedir/Data/AltSounds/Common/case1.ogg
new file mode 100644
index 000000000..655736041
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/case1.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/case2.ogg b/gamedir/Data/AltSounds/Common/case2.ogg
new file mode 100644
index 000000000..338425dea
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/case2.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/dummy.ogg b/gamedir/Data/AltSounds/Common/dummy.ogg
new file mode 100644
index 000000000..3adb23977
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/dummy.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo1.ogg b/gamedir/Data/AltSounds/Common/echo1.ogg
new file mode 100644
index 000000000..7c41941d3
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo1.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo2.ogg b/gamedir/Data/AltSounds/Common/echo2.ogg
new file mode 100644
index 000000000..b4d026c00
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo2.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo3.ogg b/gamedir/Data/AltSounds/Common/echo3.ogg
new file mode 100644
index 000000000..421bc6bef
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo3.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_building1.ogg b/gamedir/Data/AltSounds/Common/echo_building1.ogg
new file mode 100644
index 000000000..d488ed151
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_building1.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_building2.ogg b/gamedir/Data/AltSounds/Common/echo_building2.ogg
new file mode 100644
index 000000000..3455ce11f
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_building2.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_building3.ogg b/gamedir/Data/AltSounds/Common/echo_building3.ogg
new file mode 100644
index 000000000..22c4229a5
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_building3.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_dense1.ogg b/gamedir/Data/AltSounds/Common/echo_dense1.ogg
new file mode 100644
index 000000000..a3c0c0d35
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_dense1.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_dense2.ogg b/gamedir/Data/AltSounds/Common/echo_dense2.ogg
new file mode 100644
index 000000000..75462a29f
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_dense2.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_dense3.ogg b/gamedir/Data/AltSounds/Common/echo_dense3.ogg
new file mode 100644
index 000000000..597384e9d
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_dense3.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_dense4.ogg b/gamedir/Data/AltSounds/Common/echo_dense4.ogg
new file mode 100644
index 000000000..f90a4b215
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_dense4.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_hills1.ogg b/gamedir/Data/AltSounds/Common/echo_hills1.ogg
new file mode 100644
index 000000000..4ac17c659
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_hills1.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_hills2.ogg b/gamedir/Data/AltSounds/Common/echo_hills2.ogg
new file mode 100644
index 000000000..4c156a6b7
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_hills2.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_hills3.ogg b/gamedir/Data/AltSounds/Common/echo_hills3.ogg
new file mode 100644
index 000000000..bbcd80649
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_hills3.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_hills4.ogg b/gamedir/Data/AltSounds/Common/echo_hills4.ogg
new file mode 100644
index 000000000..1fc076262
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_hills4.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_town1.ogg b/gamedir/Data/AltSounds/Common/echo_town1.ogg
new file mode 100644
index 000000000..d80f9a14b
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_town1.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_town2.ogg b/gamedir/Data/AltSounds/Common/echo_town2.ogg
new file mode 100644
index 000000000..104164a8d
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_town2.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_town3.ogg b/gamedir/Data/AltSounds/Common/echo_town3.ogg
new file mode 100644
index 000000000..fc653c453
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_town3.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_town4.ogg b/gamedir/Data/AltSounds/Common/echo_town4.ogg
new file mode 100644
index 000000000..7671bf650
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_town4.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_underground1.ogg b/gamedir/Data/AltSounds/Common/echo_underground1.ogg
new file mode 100644
index 000000000..fef217be9
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_underground1.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_underground2.ogg b/gamedir/Data/AltSounds/Common/echo_underground2.ogg
new file mode 100644
index 000000000..e54e39d76
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_underground2.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_underground3.ogg b/gamedir/Data/AltSounds/Common/echo_underground3.ogg
new file mode 100644
index 000000000..28dc033e5
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_underground3.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/echo_underground4.ogg b/gamedir/Data/AltSounds/Common/echo_underground4.ogg
new file mode 100644
index 000000000..09d28d404
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/echo_underground4.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/room.ogg b/gamedir/Data/AltSounds/Common/room.ogg
new file mode 100644
index 000000000..59d87f855
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/room.ogg differ
diff --git a/gamedir/Data/AltSounds/Common/underground.ogg b/gamedir/Data/AltSounds/Common/underground.ogg
new file mode 100644
index 000000000..685921655
Binary files /dev/null and b/gamedir/Data/AltSounds/Common/underground.ogg differ