Merge pull request #342 from CHOMPStation2/Razgriz1032-patch-55

New Mech Weapon Sound Effects and UAC/2 ammo

code/game/mecha/equipment/weapons/ballistic/automatic.dm

@@ -4,8 +4,8 @@
 	icon_state = "mecha_uac2"
 	equip_cooldown = 10
 	projectile = /obj/item/projectile/bullet/pistol/medium
-	fire_sound = 'sound/weapons/Gunshot_machinegun.ogg'
-	projectiles = 30 //10 bursts, matching the Scattershot's 10. Also, conveniently, doesn't eat your powercell when reloading like 300 bullets does.
+	fire_sound = 'sound/weapons/UAC2.ogg'
+	projectiles = 300 //10 bursts, matching the Scattershot's 10. Also, conveniently, doesn't eat your powercell when reloading like 300 bullets does. //CHOMPEdit: Literally factually incorrect. You reloading 300 rounds is the same as reloading 30 rounds 10 times. Resetting this back to 300.
 	projectiles_per_shot = 3
 	deviation = 0.3
 	projectile_energy_cost = 20

code/game/mecha/equipment/weapons/ballistic/shotgun.dm

@@ -4,7 +4,7 @@
 	icon_state = "mecha_scatter"
 	equip_cooldown = 20
 	projectile = /obj/item/projectile/bullet/pellet/shotgun/flak
-	fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
+	fire_sound = 'sound/weapons/LBX10.ogg'
 	fire_volume = 80
 	projectiles = 40
 	projectiles_per_shot = 4
@@ -22,4 +22,4 @@
 	projectiles = 20
 	deviation = 1
 
-	equip_type = EQUIP_UTILITY
+	equip_type = EQUIP_UTILITY

code/game/mecha/equipment/weapons/energy/ion.dm

@@ -5,7 +5,7 @@
 	icon_state = "mecha_ion"
 	energy_drain = 120
 	projectile = /obj/item/projectile/ion
-	fire_sound = 'sound/weapons/Laser.ogg'
+	fire_sound = 'sound/weapons/IonCannon.ogg'
 
 	origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4, TECH_MAGNET = 4)
 
@@ -17,4 +17,4 @@
 	energy_drain = 100
 	projectile = /obj/item/projectile/ion/pistol
 
-	equip_type = EQUIP_UTILITY
+	equip_type = EQUIP_UTILITY

code/game/mecha/equipment/weapons/energy/laser.dm

@@ -5,7 +5,7 @@
 	icon_state = "mecha_laser"
 	energy_drain = 30
 	projectile = /obj/item/projectile/beam
-	fire_sound = 'sound/weapons/Laser.ogg'
+	fire_sound = 'sound/weapons/MediumLaser.ogg'
 
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 3, TECH_MAGNET = 3)
 
@@ -36,7 +36,7 @@
 	icon_state = "mecha_laser-rig"
 	energy_drain = 60
 	projectile = /obj/item/projectile/beam
-	fire_sound = 'sound/weapons/Laser.ogg'
+	fire_sound = 'sound/weapons/MediumLaser.ogg'
 	required_type = list(/obj/mecha/combat, /obj/mecha/working)
 
 	equip_type = EQUIP_UTILITY
@@ -50,7 +50,7 @@
 	icon_state = "mecha_laser"
 	energy_drain = 60
 	projectile = /obj/item/projectile/beam/heavylaser
-	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+	fire_sound = 'sound/weapons/LargeLaser.ogg'
 
 	origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4, TECH_MAGNET = 4)
 
@@ -65,4 +65,4 @@
 
 	equip_type = EQUIP_UTILITY
 
-	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_ILLEGAL = 1)
+	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_ILLEGAL = 1)

code/game/mecha/equipment/weapons/explosive/missile.dm

@@ -31,7 +31,7 @@
 	desc = "A missile battery that holds eight missiles."
 	icon_state = "mecha_missilerack"
 	projectile = /obj/item/missile
-	fire_sound = 'sound/weapons/rpg.ogg'
+	fire_sound = 'sound/weapons/SRM.ogg'
 	projectiles = 8
 	projectile_energy_cost = 1000
 	equip_cooldown = 60
@@ -77,4 +77,4 @@
 	projectiles = 3
 	projectile_energy_cost = 800
 
-	equip_type = EQUIP_UTILITY
+	equip_type = EQUIP_UTILITY