Gyropistol now uses magazines.

New Gyropistol and Gyropistol magazine sprites by Ausops.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4602 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/projectiles/ammunition/boxes.dm

@@ -6,16 +6,6 @@
 	max_ammo = 7
 	multiple_sprites = 1
 
-
-
-/obj/item/ammo_magazine/a75
-	name = "ammo magazine (.75)"
-	icon_state = "gyro"
-	ammo_type = "/obj/item/ammo_casing/a75"
-	max_ammo = 8
-
-
-
 /obj/item/ammo_magazine/c38
 	name = "speed loader (.38)"
 	icon_state = "38"
@@ -89,3 +79,16 @@
 	icon_state = "50ae"
 	ammo_type = "/obj/item/ammo_casing/a50"
 	max_ammo = 0
+
+/obj/item/ammo_magazine/a75
+	name = "ammo magazine (.75)"
+	icon_state = "75"
+	ammo_type = "/obj/item/ammo_casing/a75"
+	multiple_sprites = 1
+	max_ammo = 8
+
+/obj/item/ammo_magazine/a75/empty
+	name = "ammo magazine (.75)"
+	icon_state = "75"
+	ammo_type = "/obj/item/ammo_casing/a75"
+	max_ammo = 0

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

@@ -36,9 +36,6 @@
 			update_icon()
 		return
 
-	update_icon()
-		..()
-		return
 /obj/item/weapon/gun/projectile/deagle/gold
 	name = "Desert Eagle"
 	desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
@@ -60,7 +57,31 @@
 	desc = "A bulky pistol designed to fire self propelled rounds"
 	icon_state = "gyropistol"
 	max_shells = 8
-	caliber = "a75"
+	caliber = "75"
 	fire_sound = 'sound/effects/Explosion1.ogg'
 	origin_tech = "combat=3"
 	ammo_type = "/obj/item/ammo_casing/a75"
+	load_method = 2
+	New()
+		..()
+		empty_mag = new /obj/item/ammo_magazine/a75/empty(src)
+		update_icon()
+		return
+
+
+	afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+		..()
+		if(!loaded.len && empty_mag)
+			empty_mag.loc = get_turf(src.loc)
+			empty_mag = null
+			playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+			update_icon()
+		return
+
+	update_icon()
+		..()
+		if(empty_mag)
+			icon_state = "gyropistolloaded"
+		else
+			icon_state = "gyropistol"
+		return

tgstation.dme

@@ -204,7 +204,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "maps/RandomZLevels"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"