A bit of necessary merge cleanup

Fixed dummy brain controller expecting 3 rail pistol sound options, and matched its attenuation start distance and pitch variation to the rail pistol
Renamed garand ping to ping1 and added both ping sounds to the ping sound container.

Author: garethyr

Dummy.rte/Actors/Brains/Controller/Controller.ini

@@ -75,13 +75,10 @@ AddEffect = AEmitter
 	Flash = Attachable
 		CopyOf = Muzzle Flash Pistol	// Doesn't appear properly for some reason
 	BurstSound = SoundContainer
-		AttenuationStartDistance = 160
+		AttenuationStartDistance = 170
+		PitchVariation = 0.1
 		AddSound = ContentFile
 			FilePath = Dummy.rte/Devices/Weapons/RailPistol/Sounds/Fire1.flac
-		AddSound = ContentFile
-			FilePath = Dummy.rte/Devices/Weapons/RailPistol/Sounds/Fire2.flac
-		AddSound = ContentFile
-			FilePath = Dummy.rte/Devices/Weapons/RailPistol/Sounds/Fire3.flac
 	EmissionEnabled = 0
 	EmissionsIgnoreThis = 1
 	ParticlesPerMinute = 0

Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini

@@ -6,7 +6,9 @@ AddSoundContainer = SoundContainer
 	PresetName = Ronin M1 Garand Ping
 	AttenuationStartDistance = 125
 	AddSound = ContentFile
-		FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping.flac
+		FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping1.flac
+	AddSound = ContentFile
+		FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping2.flac
 
 
 ///////////////////////////////////////////////////////////////////////