Better M90 Fire Sfx & Better Sound File Naming Convention

HaloSpaceStation · Jul 23, 2024 · 35f9d25 · 35f9d25
1 parent 6498141
commit 35f9d25
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/code/modules/halo/sounds/Shotgun_Fire_New.wav b/code/modules/halo/sounds/Shotgun_Fire_New.wav
diff --git a/code/modules/halo/sounds/m90_fire.ogg b/code/modules/halo/sounds/m90_fire.ogg
diff --git a/code/modules/halo/sounds/shotgun_pump.ogg → code/modules/halo/sounds/m90_pump.ogg b/code/modules/halo/sounds/shotgun_pump.ogg → code/modules/halo/sounds/m90_pump.ogg
diff --git a/code/modules/halo/sounds/shotgun_reload.ogg → code/modules/halo/sounds/m90_reload.ogg b/code/modules/halo/sounds/shotgun_reload.ogg → code/modules/halo/sounds/m90_reload.ogg
diff --git a/code/modules/halo/sounds/shotgun_fire.ogg b/code/modules/halo/sounds/shotgun_fire.ogg
diff --git a/code/modules/halo/weapons/shotguns.dm b/code/modules/halo/weapons/shotguns.dm
@@ -7,8 +7,8 @@
 	icon = 'code/modules/halo/weapons/icons/Weapon Sprites.dmi'
 	icon_state = "m90"
 	item_state = "m90"
-	fire_sound = 'code/modules/halo/sounds/shotgun_fire.ogg'
-	reload_sound = 'code/modules/halo/sounds/shotgun_reload.ogg'
+	fire_sound = 'code/modules/halo/sounds/m90_fire.ogg'
+	reload_sound = 'code/modules/halo/sounds/m90_reload.ogg'
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet/high_power
 	caliber = "shotgunhighpower"
 	max_shells = 8
@@ -30,7 +30,7 @@
 		)
 
 /obj/item/weapon/gun/projectile/shotgun/pump/m90_ts/pump(mob/M as mob)
-	playsound(M, 'code/modules/halo/sounds/shotgun_pump.ogg', 60, 1)
+	playsound(M, 'code/modules/halo/sounds/m90_pump.ogg', 60, 1)
 
 	if(chambered)//We have a shell in the chamber
 		chambered.eject(get_turf(src), angle2dir(dir2angle(loc.dir)+ejection_angle))//Eject casing