Merge pull request #4644 from VOREStation/upstream-merge-5803

[MIRROR] Guns sounds refactor and improvements

code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm

@@ -263,9 +263,9 @@
 						if(8) src << 'sound/machines/windowdoor.ogg'
 						if(9)
 							//To make it more realistic, I added two gunshots (enough to kill)
-							src << 'sound/weapons/Gunshot.ogg'
+							src << 'sound/weapons/Gunshot1.ogg'
 							spawn(rand(10,30))
-								src << 'sound/weapons/Gunshot.ogg'
+								src << 'sound/weapons/Gunshot2.ogg'
 						if(10) src << 'sound/weapons/smash.ogg'
 						if(11)
 							//Same as above, but with tasers.

code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm

@@ -189,7 +189,7 @@
 	icon_state = "syndicateranged_shotgun"
 	icon_living = "syndicateranged_shotgun"
 	projectiletype = /obj/item/projectile/bullet/pellet/shotgun		// Buckshot
-	projectilesound = 'sound/weapons/gunshot/shotgun.ogg'
+	projectilesound = 'sound/weapons/Gunshot_shotgun.ogg'
 
 	loot_list = list(/obj/item/weapon/gun/projectile/shotgun/pump = 100)
 

code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm

@@ -28,7 +28,7 @@
 
 	projectiletype = /obj/item/projectile/bullet
 	casingtype = /obj/item/ammo_casing/spent
-	projectilesound = 'sound/weapons/Gunshot.ogg'
+	projectilesound = 'sound/weapons/Gunshot4.ogg'
 
 	loot_list = list(/obj/item/weapon/gun/projectile/revolver/mateba = 100)
 

code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm

@@ -17,7 +17,7 @@
 	movement_sound = 'sound/effects/servostep.ogg'
 
 	attacktext = list("clawed")
-	projectilesound = 'sound/weapons/Gunshot.ogg'
+	projectilesound = 'sound/weapons/Gunshot_old.ogg'
 
 	ai_holder_type = /datum/ai_holder/simple_mob/hivebot
 	say_list_type = /datum/say_list/hivebot