Merge pull request #194 from SamCroswell/master

Nukeops Weapons Rework

code/modules/projectiles/ammunition/bullets.dm

@@ -46,7 +46,7 @@
 /obj/item/ammo_casing/c10mm
 	desc = "A 10mm bullet casing."
 	caliber = "10mm"
-	projectile_type = "obj/item/projectile/bullet/midbullet10"
+	projectile_type = "/obj/item/projectile/bullet/midbullet10"
 
 /obj/item/ammo_casing/a12mm
 	desc = "A 12mm bullet casing."

code/modules/projectiles/guns/projectile/pistol.dm

@@ -75,7 +75,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/pistol
 	name = "\improper Stechtkin pistol"
-	desc = "A small, easily concealable gun. Uses 9mm rounds."
+	desc = "A small, easily concealable gun. Uses 10mm rounds."
 	icon_state = "pistol"
 	w_class = 2
 	silenced = 0
@@ -90,6 +90,8 @@
 				return
 			user << "<span class='notice'>You unscrew [silenced] from [src].</span>"
 			user.put_in_hands(silenced)
+			var/obj/item/weapon/silencer/S = silenced
+			fire_sound = S.oldsound
 			silenced = 0
 			w_class = 2
 			update_icon()
@@ -105,6 +107,9 @@
 		user.drop_item()
 		user << "<span class='notice'>You screw [I] onto [src].</span>"
 		silenced = I	//dodgy?
+		var/obj/item/weapon/silencer/S = I
+		S.oldsound = fire_sound
+		fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
 		w_class = 3
 		I.loc = src		//put the silencer into the gun
 		update_icon()
@@ -116,10 +121,10 @@
 	icon_state = "[initial(icon_state)][silenced ? "-silencer" : ""][chambered ? "" : "-e"]"
 	return
 
-
 /obj/item/weapon/silencer
 	name = "silencer"
 	desc = "a silencer"
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "silencer"
-	w_class = 2
+	w_class = 2
+	var/oldsound = 0 //Stores the true sound the gun made before it was silenced

code/modules/projectiles/projectile/bullets.dm

@@ -46,10 +46,9 @@
 
 
 /obj/item/projectile/bullet/midbullet12
-	damage = 20
+	damage = 25
 	stun = 5
 	weaken = 5
-	embed = 0
 
 /obj/item/projectile/bullet/midbullet9
 	damage = 25
@@ -95,7 +94,7 @@
 	stutter = 10
 
 /obj/item/projectile/bullet/a762
-	damage = 25
+	damage = 35
 
 
 /obj/item/projectile/bullet/incendiary