Merge pull request #3541 from SpadesNeil/AcesFixesThingses

More Munition Caliber Naming Fixes

code/datums/autolathe/arms.dm

@@ -132,9 +132,9 @@
 	path =/obj/item/ammo_magazine/m10mm
 	hidden = 1
 
-/datum/category_item/autolathe/arms/pistol_50
+/datum/category_item/autolathe/arms/pistol_44
-	name = "pistol magazine (.50AE)"
+	name = "pistol magazine (.44)"
-	path =/obj/item/ammo_magazine/m50
+	path =/obj/item/ammo_magazine/m44
 	hidden = 1
 
 /////// 5.56mm
@@ -225,9 +225,9 @@
 	category = "Arms and Ammunition"
 	hidden = 1
 
-/datum/category_item/autolathe/arms/pistol_50
+/datum/category_item/autolathe/arms/pistol_44
-	name = "pistol magazine (.50AE)"
+	name = "pistol magazine (.44)"
-	path =/obj/item/ammo_magazine/m50/empty
+	path =/obj/item/ammo_magazine/m44/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
@@ -340,7 +340,7 @@
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_clip_50
-	name = "ammo clip (.50AE)"
+	name = "ammo clip (.44)"
 	path =/obj/item/ammo_magazine/clip/c50
 	category = "Arms and Ammunition"
 	hidden = 1

code/modules/projectiles/ammunition.dm

@@ -65,7 +65,7 @@
 /obj/item/ammo_magazine
 	name = "magazine"
 	desc = "A magazine for some kind of gun."
-	icon_state = "357"
+	icon_state = ".357"
 	icon = 'icons/obj/ammo.dmi'
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
@@ -78,7 +78,7 @@
 
 	var/list/stored_ammo = list()
 	var/mag_type = SPEEDLOADER //ammo_magazines can only be used with compatible guns. This is not a bitflag, the load_method var on guns is.
-	var/caliber = "357"
+	var/caliber = ".357"
 	var/max_ammo = 7
 
 	var/ammo_type = /obj/item/ammo_casing //ammo type that is initially loaded

code/modules/projectiles/ammunition/magazines.dm

@@ -30,7 +30,7 @@
 	name = "speedloader (.357)"
 	desc = "A speedloader for .357 revolvers."
 	icon_state = "38"
-	caliber = "357"
+	caliber = ".357"
 	ammo_type = /obj/item/ammo_casing/a357
 	matter = list(DEFAULT_WALL_MATERIAL = 1260)
 	max_ammo = 6
@@ -381,28 +381,28 @@
 /obj/item/ammo_magazine/m556saw/empty
 	initial_ammo = 0
 
-///////// .50 AE /////////
+///////// .44 Magnum /////////
 
-/obj/item/ammo_magazine/m50
+/obj/item/ammo_magazine/m44
-	name = "magazine (.50 AE)"
+	name = "magazine (.44)"
-	icon_state = "50ae"
+	icon_state = ".44"
 	origin_tech = list(TECH_COMBAT = 2)
 	mag_type = MAGAZINE
-	caliber = ".50AE"
+	caliber = ".44"
 	matter = list(DEFAULT_WALL_MATERIAL = 1260)
-	ammo_type = /obj/item/ammo_casing/a50ae
+	ammo_type = /obj/item/ammo_casing/a44
 	max_ammo = 7
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/m50/empty
+/obj/item/ammo_magazine/m44/empty
 	initial_ammo = 0
 
-/obj/item/ammo_magazine/clip/c50
+/obj/item/ammo_magazine/clip/c44
-	name = "ammo clip (.50 AE)"
+	name = "ammo clip (.44)"
 	icon_state = "clip_pistol"
-	desc = "A stripper clip for reloading .50 Action Express rounds into magazines."
+	desc = "A stripper clip for reloading .44 rounds into magazines."
-	caliber = ".50AE"
+	caliber = ".44"
-	ammo_type = /obj/item/ammo_casing/a50ae
+	ammo_type = /obj/item/ammo_casing/a44
 	matter = list(DEFAULT_WALL_MATERIAL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal
 	max_ammo = 9
 	multiple_sprites = 1

code/modules/projectiles/ammunition/rounds.dm

@@ -25,7 +25,7 @@
 
 /obj/item/ammo_casing/a357
 	desc = "A .357 bullet casing."
-	caliber = "357"
+	caliber = ".357"
 	projectile_type = /obj/item/projectile/bullet/pistol/strong
 
 /*
@@ -54,9 +54,9 @@
  * .50 Action Express
  */
 
-/obj/item/ammo_casing/a50ae
+/obj/item/ammo_casing/a44
-	desc = "A .50AE bullet casing."
+	desc = "A .44 bullet casing."
-	caliber = ".50AE"
+	caliber = ".44"
 	projectile_type = /obj/item/projectile/bullet/pistol/strong
 
 /*

code/modules/projectiles/guns/projectile.dm

@@ -11,7 +11,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 1000)
 	recoil = 1
 
-	var/caliber = "357"		//determines which casings will fit
+	var/caliber = ".357"		//determines which casings will fit
 	var/handle_casings = EJECT_CASINGS	//determines how spent casings should be handled
 	var/load_method = SINGLE_CASING|SPEEDLOADER //1 = Single shells, 2 = box or quick loader, 3 = magazine
 	var/obj/item/ammo_casing/chambered = null

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

@@ -116,15 +116,15 @@
 
 /obj/item/weapon/gun/projectile/deagle
 	name = "desert eagle"
-	desc = "A robust handgun that uses .50 AE rounds."
+	desc = "The perfect handgun for shooters with a need to hit targets through a wall and behind a fridge in your neighbor's house. Uses .44 rounds."
 	icon_state = "deagle"
 	item_state = "deagle"
 	force = 14.0
-	caliber = ".50AE"
+	caliber = ".44"
 	load_method = MAGAZINE
 	fire_sound = 'sound/weapons/deagle.ogg'
-	magazine_type = /obj/item/ammo_magazine/m50
+	magazine_type = /obj/item/ammo_magazine/m44
-	allowed_magazines = list(/obj/item/ammo_magazine/m50)
+	allowed_magazines = list(/obj/item/ammo_magazine/m44)
 
 /obj/item/weapon/gun/projectile/deagle/update_icon()
 	..()
@@ -134,12 +134,12 @@
 		icon_state = "[initial(icon_state)]-e"
 
 /obj/item/weapon/gun/projectile/deagle/gold
-	desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE rounds."
+	desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .44 rounds."
 	icon_state = "deagleg"
 	item_state = "deagleg"
 
 /obj/item/weapon/gun/projectile/deagle/camo
-	desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE rounds."
+	desc = "A Deagle brand Deagle for operators operating operationally. Uses .44 rounds."
 	icon_state = "deaglecamo"
 	item_state = "deagleg"
 
@@ -259,14 +259,14 @@
 		/obj/item/ammo_casing/a9mmf             = "9mm",
 		/obj/item/ammo_casing/a45f              = ".45",
 		/obj/item/ammo_casing/a10mm             = "10mm",
-		/obj/item/ammo_casing/a12g           = "12 gauge",
+		/obj/item/ammo_casing/a12g              = "12g",
-		/obj/item/ammo_casing/a12g           = "12 gauge",
+		/obj/item/ammo_casing/a12g              = "12g",
-		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
+		/obj/item/ammo_casing/a12g/pellet       = "12g",
-		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
+		/obj/item/ammo_casing/a12g/pellet       = "12g",
-		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
+		/obj/item/ammo_casing/a12g/pellet       = "12g",
-		/obj/item/ammo_casing/a12g/beanbag   = "12 gauge",
+		/obj/item/ammo_casing/a12g/beanbag      = "12g",
-		/obj/item/ammo_casing/a12g/stunshell = "12 gauge",
+		/obj/item/ammo_casing/a12g/stunshell    = "12g",
-		/obj/item/ammo_casing/a12g/flash     = "12 gauge",
+		/obj/item/ammo_casing/a12g/flash        = "12g",
 		/obj/item/ammo_casing/a762              = "7.62mm",
 		/obj/item/ammo_casing/a556              = "5.56mm"
 		)

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

@@ -3,7 +3,7 @@
 	desc = "The Lumoco Arms HE Colt is a choice revolver for when you absolutely, positively need to put a hole in the other guy. Uses .357 rounds."
 	icon_state = "revolver"
 	item_state = "revolver"
-	caliber = "357"
+	caliber = ".357"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	handle_casings = CYCLE_CASINGS
 	max_shells = 6