Caliber defines (#4573)

* Changes calibers to defines

* 35a is not used, but heck might as well add it

* just make it a little wider

code/modules/projectiles/_defines.dm

@@ -1 +1,30 @@
-//Stub
+//Caliber Defines
+#define CAL_357 ".357"
+#define CAL_CLRIFLE ".25 Caseless"
+#define CAL_SRIFLE ".20"
+#define CAL_PISTOL ".35"
+#define CAL_35A ".35 auto"
+#define CAL_LRIFLE ".30"
+#define CAL_MAGNUM ".40 magnum"
+#define CAL_ANTIM ".60 Anti Material"
+#define CAL_SHOTGUN "Shotgun Shell"
+#define CAL_70 ".70"
+#define CAL_CAP "plastic cap"
+#define CAL_ROCKET "rocket propelled grenade"
+#define CAL_DART "chemical dart"
+
+//Gun loading types
+#define SINGLE_CASING 	1	//The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type.
+#define SPEEDLOADER 	2	//Transfers casings from the mag to the gun when used.
+#define MAGAZINE 		4	//The magazine item itself goes inside the gun
+
+#define MAG_WELL_GENERIC	0	//Guns without special magwells
+#define MAG_WELL_L_PISTOL	1	//Pistols
+#define MAG_WELL_PISTOL		2
+#define MAG_WELL_H_PISTOL	4	//High cap Pistols
+#define MAG_WELL_SMG		8	//smgs
+#define MAG_WELL_RIFLE		16	//Normal non-IH rifles
+#define MAG_WELL_IH			32	//IH guns
+#define MAG_WELL_BOX		64	//Lmgs with box mags
+#define MAG_WELL_PAN		128	//Lmgs with pan mags
+#define MAG_WELL_DART       256 //Dartgun mag

code/modules/projectiles/ammunition.dm

@@ -147,22 +147,6 @@
 	if (!BB)
 		to_chat(user, "[(amount == 1)? "This one is" : "These ones are"] spent.")
 
-//Gun loading types
-#define SINGLE_CASING 	1	//The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type.
-#define SPEEDLOADER 	2	//Transfers casings from the mag to the gun when used.
-#define MAGAZINE 		4	//The magazine item itself goes inside the gun
-
-#define MAG_WELL_GENERIC	0	//Guns without special magwells
-#define MAG_WELL_L_PISTOL	1	//Pistols
-#define MAG_WELL_PISTOL		2
-#define MAG_WELL_H_PISTOL	4	//High cap Pistols
-#define MAG_WELL_SMG		8	//smgs
-#define MAG_WELL_RIFLE		16	//Normal non-IH rifles
-#define MAG_WELL_IH			32	//IH guns
-#define MAG_WELL_BOX		64	//Lmgs with box mags
-#define MAG_WELL_PAN		128	//Lmgs with pan mags
-#define MAG_WELL_DART       256 //Dartgun mag
-
 //An item that holds casings and can be used to put them inside guns
 /obj/item/ammo_magazine
 	name = "magazine"
@@ -183,7 +167,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/mag_well = MAG_WELL_GENERIC
-	var/caliber = "357"
+	var/caliber = CAL_357
 	var/ammo_mag = "default"
 	var/max_ammo = 7
 	var/reload_delay = 0 //when we need to make reload slower

code/modules/projectiles/ammunition/boxes.dm

@@ -41,7 +41,7 @@
 	name = "ammunition packet (.35 Auto)"
 	icon_state = "pistol_l"
 	matter = list(MATERIAL_STEEL = 6, MATERIAL_CARDBOARD = 1)
-	caliber = "pistol"
+	caliber = CAL_PISTOL
 	ammo_type = /obj/item/ammo_casing/pistol
 	max_ammo = 30
 
@@ -66,7 +66,7 @@
 	name = "ammunition packet (.40 Magnum)"
 	icon_state = "magnum_l"
 	matter = list(MATERIAL_STEEL = 9, MATERIAL_CARDBOARD = 1)
-	caliber = "magnum"
+	caliber = CAL_MAGNUM
 	ammo_type = /obj/item/ammo_casing/magnum
 	max_ammo = 30
 
@@ -92,7 +92,7 @@
 	icon_state = "box_srifle_l"
 	matter = list(MATERIAL_STEEL = 60)
 	w_class = ITEM_SIZE_BULKY
-	caliber = "srifle"
+	caliber = CAL_SRIFLE
 	ammo_type = /obj/item/ammo_casing/srifle
 	max_ammo = 240
 
@@ -105,7 +105,7 @@
 	name = "ammunition packet (.20 Rifle)"
 	icon_state = "srifle_l"
 	matter = list(MATERIAL_STEEL = 20, MATERIAL_CARDBOARD = 1)
-	caliber = "srifle"
+	caliber = CAL_SRIFLE
 	ammo_type = /obj/item/ammo_casing/srifle
 	max_ammo = 60
 
@@ -131,7 +131,7 @@
 	icon_state = "box_clrifle_l"
 	matter = list(MATERIAL_STEEL = 60)
 	w_class = ITEM_SIZE_BULKY
-	caliber = "clrifle"
+	caliber = CAL_CLRIFLE
 	ammo_type = /obj/item/ammo_casing/clrifle
 	max_ammo = 240
 
@@ -144,7 +144,7 @@
 	name = "ammunition packet (.25 Caseless Rifle)"
 	icon_state = "clrifle_l"
 	matter = list(MATERIAL_STEEL = 20, MATERIAL_CARDBOARD = 1)
-	caliber = "clrifle"
+	caliber = CAL_CLRIFLE
 	ammo_type = /obj/item/ammo_casing/clrifle
 	max_ammo = 60
 
@@ -170,7 +170,7 @@
 	icon_state = "box_lrifle_l"
 	matter = list(MATERIAL_STEEL = 60)
 	w_class = ITEM_SIZE_BULKY
-	caliber = "lrifle"
+	caliber = CAL_LRIFLE
 	ammo_type = /obj/item/ammo_casing/lrifle
 	mag_type = SPEEDLOADER | MAGAZINE
 	max_ammo = 240
@@ -179,7 +179,7 @@
 	name = "ammunition packet (.30 Rifle lethal)"
 	icon_state = "lrifle_l"
 	matter = list(MATERIAL_STEEL = 20, MATERIAL_CARDBOARD = 1)
-	caliber = "lrifle"
+	caliber = CAL_LRIFLE
 	ammo_type = /obj/item/ammo_casing/lrifle
 	max_ammo = 60
 
@@ -205,7 +205,7 @@
 	icon_state = "antim"
 	matter = list(MATERIAL_STEEL = 24)
 	w_class = ITEM_SIZE_BULKY
-	caliber = "antim"
+	caliber = CAL_ANTIM
 	ammo_type = /obj/item/ammo_casing/antim
 	max_ammo = 30
 

code/modules/projectiles/ammunition/bullets.dm

@@ -2,114 +2,114 @@
 //// .35 ////
 /obj/item/ammo_casing/pistol
 	desc = "A .35 Auto bullet casing."
-	caliber = "pistol"
+	caliber = CAL_PISTOL
 	projectile_type = /obj/item/projectile/bullet/pistol
 
 /obj/item/ammo_casing/pistol/hv
 	desc = "A .35 Auto high-velocity bullet casing."
-	caliber = "pistol"
+	caliber = CAL_PISTOL
 	projectile_type = /obj/item/projectile/bullet/pistol/hv
 
 /obj/item/ammo_casing/pistol/practice
 	desc = "A .35 Auto practice bullet casing."
-	caliber = "pistol"
+	caliber = CAL_PISTOL
 	projectile_type = /obj/item/projectile/bullet/pistol/practice
 
 /obj/item/ammo_casing/pistol/rubber
 	desc = "A .35 Auto rubber bullet casing."
-	caliber = "pistol"
+	caliber = CAL_PISTOL
 	projectile_type = /obj/item/projectile/bullet/pistol/rubber
 
 //// .40 ////
 
 /obj/item/ammo_casing/magnum
 	desc = "A .40 Magnum hollow point bullet casing."
-	caliber = "magnum"
+	caliber = CAL_MAGNUM
 	projectile_type = /obj/item/projectile/bullet/magnum
 
 /obj/item/ammo_casing/magnum/practice
 	desc = "A .40 Magnum practice bullet casing."
-	caliber = "magnum"
+	caliber = CAL_MAGNUM
 	projectile_type = /obj/item/projectile/bullet/magnum/practice
 
 /obj/item/ammo_casing/magnum/hv
 	desc = "A .40 Magnum high-velocity bullet casing."
-	caliber = "magnum"
+	caliber = CAL_MAGNUM
 	projectile_type = /obj/item/projectile/bullet/magnum/hv
 
 /obj/item/ammo_casing/magnum/rubber
 	desc = "A .40 Magnum rubber bullet casing."
-	caliber = "magnum"
+	caliber = CAL_MAGNUM
 	projectile_type = /obj/item/projectile/bullet/magnum/rubber
 
 //// .20 ////
 
 /obj/item/ammo_casing/srifle
 	desc = "A .20 Rifle bullet casing."
-	caliber = "srifle"
+	caliber = CAL_SRIFLE
 	projectile_type = /obj/item/projectile/bullet/srifle
 
 /obj/item/ammo_casing/srifle/practice
 	desc = "A .20 Rifle practice bullet casing."
-	caliber = "srifle"
+	caliber = CAL_SRIFLE
 	projectile_type = /obj/item/projectile/bullet/srifle/practice
 
 /obj/item/ammo_casing/srifle/hv
 	desc = "A .20 Rifle high-velocity bullet casing."
-	caliber = "srifle"
+	caliber = CAL_SRIFLE
 	projectile_type = /obj/item/projectile/bullet/srifle/hv
 
 /obj/item/ammo_casing/srifle/rubber
 	desc = "A .20 Rifle rubber bullet casing."
-	caliber = "srifle"
+	caliber = CAL_SRIFLE
 	projectile_type = /obj/item/projectile/bullet/srifle/rubber
 
 //// .25 ////
 
 /obj/item/ammo_casing/clrifle
 	desc = "A .25 Caseless Rifle bullet casing."
-	caliber = "clrifle"
+	caliber = CAL_CLRIFLE
 	projectile_type = /obj/item/projectile/bullet/clrifle
 	is_caseless = TRUE
 
 /obj/item/ammo_casing/clrifle/practice
 	desc = "A .25 Caseless Rifle practice bullet casing."
-	caliber = "clrifle"
+	caliber = CAL_CLRIFLE
 	projectile_type = /obj/item/projectile/bullet/clrifle/practice
 	is_caseless = TRUE
 
 /obj/item/ammo_casing/clrifle/hv
 	desc = "A .25 Caseless Rifle high-velocity bullet casing."
-	caliber = "clrifle"
+	caliber = CAL_CLRIFLE
 	projectile_type = /obj/item/projectile/bullet/clrifle/hv
 	is_caseless = TRUE
 
 /obj/item/ammo_casing/clrifle/rubber
 	desc = "A .25 Caseless Rifle rubber bullet casing."
-	caliber = "clrifle"
+	caliber = CAL_CLRIFLE
 	projectile_type = /obj/item/projectile/bullet/clrifle/rubber
 	is_caseless = TRUE
 
 //// .30 ////
 
 /obj/item/ammo_casing/lrifle
 	desc = "A .30 rifle bullet casing."
-	caliber = "lrifle"
+	caliber = CAL_LRIFLE
 	projectile_type = /obj/item/projectile/bullet/lrifle
 
 /obj/item/ammo_casing/lrifle/practice
 	desc = "A .30 rifle practice bullet casing."
-	caliber = "lrifle"
+	caliber = CAL_LRIFLE
 	projectile_type = /obj/item/projectile/bullet/lrifle/practice
 
 /obj/item/ammo_casing/lrifle/hv
 	desc = "A .30 Rifle high-velocity bullet casing."
-	caliber = "lrifle"
+	caliber = CAL_LRIFLE
 	projectile_type = /obj/item/projectile/bullet/lrifle/hv
 
 /obj/item/ammo_casing/lrifle/rubber
 	desc = "A .30 Rifle rubber bullet casing."
-	caliber = "lrifle"
+	caliber = CAL_LRIFLE
 	projectile_type = /obj/item/projectile/bullet/lrifle/rubber
 
 //// .60 ////
@@ -119,7 +119,7 @@
 	desc = "A .60 Anti-Material shell."
 	icon_state = "lcasing"
 	spent_icon = "lcasing-spent"
-	caliber = "antim"
+	caliber = CAL_ANTIM
 	projectile_type = /obj/item/projectile/bullet/antim
 	matter = list(MATERIAL_STEEL = 2)
 	maxamount = 5
@@ -134,7 +134,7 @@
 	desc = "A .50 slug."
 	icon_state = "slshell"
 	spent_icon = "slshell-spent"
-	caliber = "shotgun"
+	caliber = CAL_SHOTGUN
 	projectile_type = /obj/item/projectile/bullet/shotgun
 	matter = list(MATERIAL_STEEL = 1)
 	maxamount = 5
@@ -216,20 +216,20 @@
 	desc = "A 1.5 warhead designed for the RPG-7 launcher. Has tubular shape."
 	icon_state = "rocketshell"
 	projectile_type = /obj/item/projectile/bullet/rocket
-	caliber = "rocket"
+	caliber = CAL_ROCKET
 	maxamount = 1
 	reload_delay = 15
 	is_caseless = TRUE
 	w_class = ITEM_SIZE_NORMAL
 
 /obj/item/ammo_casing/a75
 	desc = "A .70 bullet casing."
-	caliber = "70"
+	caliber = CAL_70
 	projectile_type = /obj/item/projectile/bullet/gyro
 
 /obj/item/ammo_casing/cap
 	name = "cap"
 	desc = "A cap for children toys."
-	caliber = "caps"
+	caliber = CAL_CAP
 	color = "#FF0000"
 	projectile_type = /obj/item/projectile/bullet/cap