Final commit

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -46,7 +46,6 @@
 	max_shells = 36
 	caliber = "9.5x40mm"
 	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
-	ammo_type = /obj/item/ammo_casing/a95mm
 	magazine_type = /obj/item/ammo_magazine/battlerifle
 	allowed_magazines = list(/obj/item/ammo_magazine/battlerifle)
 	fire_sound = 'sound/weapons/battlerifle.ogg'
@@ -171,7 +170,7 @@
 // LuminescentRing : Briana Moore
 /obj/item/weapon/gun/projectile/derringer/fluff/briana
 	name = "second-hand derringer"
-	desc = "It's a palm sized gun. One of the few things that won't break an angel's wrists."
+	desc = "It's a palm sized gun. One of the few things that won't break an angel's wrists. Uses 10mm rounds."
 	caliber = "10mm"
 	ammo_type = /obj/item/ammo_casing/a10mm
 
@@ -354,7 +353,8 @@
 		icon_state = "tranqgun"
 	return 1
 
-//-----------------------UF-ARC----------------------------------
+// Removed because gun64_vr.dmi guns don't work.
+/*//-----------------------UF-ARC----------------------------------
 /obj/item/weapon/gun/projectile/automatic/carbine/fluff/ufarc
 	name = "UF-ARC"
 	desc = "The UF-ARC is a lightweight assault rifle manufactured by the National Armory of Gaia and sold almost exclusively to the United Federation's standing army, the Military Assault Command Operations Department (MACOs)."
@@ -416,7 +416,7 @@
 		list(mode_name="stun burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg'),
 		list(mode_name="lethal", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 200),
 		list(mode_name="lethal burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg'),
-		)
+		)*/
 
 
 // molenar:Kari Akiren
@@ -472,7 +472,6 @@
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 
 	caliber = ".44"
-	ammo_type = /obj/item/ammo_casing/a44/rubber
 	magazine_type = /obj/item/ammo_magazine/m44/rubber
 	allowed_magazines = list(/obj/item/ammo_magazine/m44,/obj/item/ammo_magazine/m44/rubber)
 	load_method = MAGAZINE
@@ -499,7 +498,6 @@
 	icon_state = "giskardcivil"
 
 	caliber = ".32"
-	ammo_type = /obj/item/ammo_casing/a32
 	magazine_type = /obj/item/ammo_magazine/m32
 	allowed_magazines = list(/obj/item/ammo_magazine/m32)
 	load_method = MAGAZINE
@@ -508,7 +506,7 @@
 
 	w_class = ITEMSIZE_SMALL
 
-	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	fire_sound = 'sound/weapons/semiauto.ogg'
 
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 3)
 
@@ -528,14 +526,13 @@
 	icon_state = "olivawcivil"
 
 	caliber = ".32"
-	ammo_type = /obj/item/ammo_casing/a32
 	magazine_type = /obj/item/ammo_magazine/m32
 	allowed_magazines = list(/obj/item/ammo_magazine/m32)
 	fire_delay = 1.2
 	load_method = MAGAZINE
 	accuracy = 2
 
-	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	fire_sound = 'sound/weapons/semiauto.ogg'
 
 	firemodes = list(
 		list(mode_name="semiauto",       burst=1, fire_delay=1.2,    move_delay=null, burst_accuracy=null, dispersion=null),
@@ -554,7 +551,7 @@
 //Detective gun
 /obj/item/weapon/gun/projectile/revolver/consul
 	name = "FS REV .44 \"Consul\""
-	desc = "Are you feeling lucky, punk? Uses .44 ammo."
+	desc = "Are you feeling lucky, punk? Uses .44 rounds."
 
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "inspector"
@@ -589,7 +586,6 @@
 	slot_flags = SLOT_BELT
 
 	caliber = "9mm"
-	ammo_type = /obj/item/ammo_casing/a9mm
 	magazine_type = /obj/item/ammo_magazine/m9mm
 	allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
 	load_method = MAGAZINE
@@ -797,11 +793,15 @@
 	projectile_type = /obj/item/projectile/bullet/pistol
 
 /obj/item/ammo_magazine/m32
-	icon_state = "a762"
+	name = "magazine (.32)"
+	icon_state = "9x19p"
+	origin_tech = list(TECH_COMBAT = 2)
+	mag_type = MAGAZINE
+	matter = list(DEFAULT_WALL_MATERIAL = 480)
 	caliber = ".32"
 	ammo_type = /obj/item/ammo_casing/a32
-	max_ammo = 6
-	mag_type = MAGAZINE
+	max_ammo = 8
+	multiple_sprites = 1
 
 //.44
 /obj/item/ammo_casing/a44/rubber