diff --git a/Resources/Audio/Weapons/Guns/Gunshots/atreides.ogg b/Resources/Audio/Weapons/Guns/Gunshots/atreides.ogg
new file mode 100644
index 0000000000..434cf3ffb6
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/atreides.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/c-20r.ogg b/Resources/Audio/Weapons/Guns/Gunshots/c-20r.ogg
new file mode 100644
index 0000000000..63a53242d5
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/c-20r.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/flaregun.ogg b/Resources/Audio/Weapons/Guns/Gunshots/flaregun.ogg
new file mode 100644
index 0000000000..2f5986d771
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/flaregun.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/license.txt b/Resources/Audio/Weapons/Guns/Gunshots/license.txt
new file mode 100644
index 0000000000..acff754062
--- /dev/null
+++ b/Resources/Audio/Weapons/Guns/Gunshots/license.txt
@@ -0,0 +1,2 @@
+atreides.ogg, c-20r.ogg, flaregun.ogg, mateba.ogg, minigun.ogg, mk58.ogg were taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons
+They are licensed under CC-BY-SA 3.0
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/mateba.ogg b/Resources/Audio/Weapons/Guns/Gunshots/mateba.ogg
new file mode 100644
index 0000000000..b0679d703d
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/mateba.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/minigun.ogg b/Resources/Audio/Weapons/Guns/Gunshots/minigun.ogg
new file mode 100644
index 0000000000..208462ca42
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/minigun.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/mk58.ogg b/Resources/Audio/Weapons/Guns/Gunshots/mk58.ogg
new file mode 100644
index 0000000000..3ead775dea
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/mk58.ogg differ
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 6c793f789c..6a40806850 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -34,6 +34,8 @@
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
   - type: Gun
     fireRate: 15
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
   - type: BallisticAmmoProvider
     proto: CartridgeMinigun
     capacity: 1000
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 66e63fd55c..c94019faed 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -161,3 +161,5 @@
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
   - type: Gun
     fireRate: 5
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index b02c9ce7fe..a33e5b5011 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -77,6 +77,9 @@
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
   - type: RevolverAmmoProvider
     capacity: 7
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
 
 - type: entity
   name: Predator
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 2ad36f7f6c..2bc5cabd28 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -61,6 +61,8 @@
     sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
   - type: Gun
     fireRate: 10
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -83,6 +85,8 @@
   - type: Item
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
   - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
   - type: ChamberMagazineAmmoProvider
     # autoEject: true # Do not set this until the PVS prediction issue is resolved
   - type: MagazineVisuals
@@ -109,6 +113,8 @@
   - type: Gun
     fireRate: 6
     selectedMode: FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
     availableModes:
     - FullAuto
   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
index df2de4e816..8be9fef539 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -18,7 +18,7 @@
     availableModes:
       - SemiAuto
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
+      path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
   - type: BallisticAmmoProvider
     whitelist:
       tags: