From ca9ab8ebd7e13370f18d2fa8dde09d8e2f376b4f Mon Sep 17 00:00:00 2001
From: paprka <joecool9900@hotmail.com>
Date: Tue, 30 Sep 2014 16:34:16 -0700
Subject: [PATCH] updated coding

---
 code/datums/uplink_item.dm                    |  2 +-
 .../projectiles/ammunition/magazines.dm       | 10 +--------
 .../projectiles/guns/projectile/automatic.dm  | 22 +++++++++----------
 .../projectiles/guns/projectile/pistol.dm     | 14 ++++--------
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 655c7c0854a..bae3be817ca 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -256,7 +256,7 @@ var/list/uplink_items = list()
 	name = "Ammo-12g Dragon's Breath"
 	desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. I'm a fire starter, twisted fire starter!"
 	item = /obj/item/ammo_box/magazine/m12g/dragon
-	cost = 2
+	cost = 3
 	gamemodes = list(/datum/game_mode/nuclear)
 
 /datum/uplink_item/ammo/machinegun
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index add92ed09db..4ea3e418f69 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -178,16 +178,8 @@ obj/item/ammo_box/magazine/tommygunm45
 	icon_state = "m12gb"
 	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
 
-/obj/item/ammo_box/magazine/m12g/buckshot/update_icon()
-	..()
-	icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*8]"
-
 
 /obj/item/ammo_box/magazine/m12g/dragon
 	name = "shotgun magazine (12g dragon's breath)"
 	icon_state = "m12gf"
-	ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
-
-/obj/item/ammo_box/magazine/m12g/dragon/update_icon()
-	..()
-	icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*8]"
\ No newline at end of file
+	ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 1c84d1d1bd1..de3282ca807 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -16,6 +16,12 @@
 	if(..() && chambered)
 		alarmed = 0
 
+/obj/item/weapon/gun/projectile/automatic/proc/empty_alarm(atom/target, mob/living/user, flag)
+	if(!chambered && !get_ammo() && !alarmed)
+		playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+		update_icon()
+		alarmed = 1
+	return
 
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
 	name = "Uzi"
@@ -43,16 +49,11 @@
 	update_icon()
 	return
 
-
-/obj/item/weapon/gun/projectile/automatic/c20r/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+/obj/item/weapon/gun/projectile/automatic/c20r/afterattack(atom/target, mob/living/user, flag)
 	..()
-	if(!chambered && !get_ammo() && !alarmed)
-		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-		update_icon()
-		alarmed = 1
+	empty_alarm()
 	return
 
-
 /obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
 	..()
 	icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"]"
@@ -140,12 +141,9 @@
 	icon_state = "bulldog[chambered ? "" : "-e"]"
 	return
 
-/obj/item/weapon/gun/projectile/automatic/bulldog/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+/obj/item/weapon/gun/projectile/automatic/bulldog/afterattack(atom/target, mob/living/user, flag)
 	..()
-	if(!chambered && !get_ammo() && !alarmed)
-		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-		update_icon()
-		alarmed = 1
+	empty_alarm()
 	return
 
 /obj/item/weapon/gun/projectile/automatic/tommygun
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 070d1900e3b..b412a63ec3a 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -22,12 +22,9 @@
 	mag_type = /obj/item/ammo_box/magazine/m50
 
 
-/obj/item/weapon/gun/projectile/automatic/deagle/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+/obj/item/weapon/gun/projectile/automatic/deagle/afterattack(atom/target, mob/living/user, flag)
 	..()
-	if(!chambered && !get_ammo() && !alarmed)
-		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-		update_icon()
-		alarmed = 1
+	empty_alarm()
 	return
 
 /obj/item/weapon/gun/projectile/automatic/deagle/update_icon()
@@ -59,12 +56,9 @@
 /obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(var/eject_casing = 0, var/empty_chamber = 1)
 	..()
 
-/obj/item/weapon/gun/projectile/automatic/gyropistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+/obj/item/weapon/gun/projectile/automatic/gyropistol/afterattack(atom/target, mob/living/user, flag)
 	..()
-	if(!chambered && !get_ammo() && !alarmed)
-		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-		update_icon()
-		alarmed = 1
+	empty_alarm()
 	return
 
 /obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon()