Gunshot sounds, uplink references, less spammy tommygun, fixes

code/modules/projectiles/guns/projectile.dm

@@ -20,7 +20,7 @@
 
 /obj/item/weapon/gun/projectile/New()
 	..()
-	if (!magazine)
+	if(!magazine)
 		magazine = new mag_type(src)
 	chamber_round()
 	update_icon()
@@ -53,9 +53,9 @@
 
 
 /obj/item/weapon/gun/projectile/proc/chamber_round()
-	if (chambered || !magazine)
+	if(chambered || !magazine)
 		return
-	else if (magazine.ammo_count())
+	else if(magazine.ammo_count())
 		chambered = magazine.get_round()
 		chambered.loc = src
 	return
@@ -63,9 +63,9 @@
 
 /obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob, params)
 	..()
-	if (istype(A, /obj/item/ammo_box/magazine))
+	if(istype(A, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/magazine/AM = A
-		if (!magazine && istype(AM, text2path(mag_type)))
+		if(!magazine && istype(AM, text2path(mag_type)))
 			user.remove_from_mob(AM)
 			magazine = AM
 			magazine.loc = src
@@ -74,7 +74,7 @@
 			A.update_icon()
 			update_icon()
 			return 1
-		else if (magazine)
+		else if(magazine)
 			to_chat(user, "<span class='notice'>There's already a magazine in \the [src].</span>")
 	if(istype(A, /obj/item/weapon/suppressor))
 		var/obj/item/weapon/suppressor/S = A
@@ -135,9 +135,9 @@
 
 /obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1)
 	var/boolets = 0 //mature var names for mature people
-	if (chambered && countchambered)
+	if(chambered && countchambered)
 		boolets++
-	if (magazine)
+	if(magazine)
 		boolets += magazine.ammo_count()
 	return boolets
 

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

@@ -5,7 +5,6 @@
 	icon_state = "saber"
 	item_state = "gun"
 	mag_type = "/obj/item/ammo_box/magazine/toy/smg"
-	fire_sound = 'sound/items/syringeproj.ogg'
 	force = 0
 	throwforce = 0
 	burst_size = 3
@@ -22,6 +21,7 @@
 	icon_state = "pistol"
 	w_class = 2
 	mag_type = "/obj/item/ammo_box/magazine/toy/pistol"
+	fire_sound = 'sound/weapons/Gunshot.ogg'
 	can_suppress = 0
 	burst_size = 1
 	fire_delay = 0
@@ -61,17 +61,7 @@
 /obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chambered()
 	return ..(0, 1)
 
-/obj/item/weapon/gun/projectile/automatic/tommygun/toy
-	name = "tommy gun"
-	desc = "Looks almost like the real thing! Great for practicing Drive-bys. Ages 8 and up."
-	icon_state = "tommygun"
-	item_state = "shotgun"
-	w_class = 2
-	mag_type = "/obj/item/ammo_box/magazine/toy/tommygunm45"
-	fire_sound = 'sound/items/syringeproj.ogg'
 
-/obj/item/weapon/gun/projectile/automatic/tommygun/toy/process_chambered()
-	return ..(0, 1)
 
 /obj/item/weapon/gun/projectile/shotgun/toy
 	name = "foam force shotgun"
@@ -81,7 +71,6 @@
 	throwforce = 0
 	origin_tech = null
 	mag_type = "/obj/item/ammo_box/magazine/internal/shot/toy"
-	fire_sound = 'sound/items/syringeproj.ogg'
 	clumsy_check = 0
 	needs_permit = 0
 
@@ -97,5 +86,15 @@
 	icon_state = "crossbow"
 	item_state = "crossbow"
 	mag_type = "/obj/item/ammo_box/magazine/internal/shot/toy/crossbow"
+	fire_sound = 'sound/items/syringeproj.ogg'
 	slot_flags = SLOT_BELT
 	w_class = 2
+
+/obj/item/weapon/gun/projectile/shotgun/toy/tommygun
+	name = "tommy gun"
+	desc = "Looks almost like the real thing! Great for practicing Drive-bys. Ages 8 and up."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "tommy"
+	item_state = "shotgun"
+	mag_type = "/obj/item/ammo_box/magazine/internal/shot/toy/tommygun"
+	w_class = 2