Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

code/modules/projectiles/ammunition/caseless/misc.dm

@@ -10,7 +10,7 @@
 /obj/item/ammo_casing/caseless/laser
 	name = "laser casing"
 	desc = "You shouldn't be seeing this."
-	caliber = "laser"
+	caliber = LASER
 	icon_state = "s-casing-live"
 	projectile_type = /obj/item/projectile/beam
 	fire_sound = 'sound/weapons/laser.ogg'

code/modules/projectiles/ammunition/energy/_energy.dm

@@ -1,7 +1,7 @@
 /obj/item/ammo_casing/energy
 	name = "energy weapon lens"
 	desc = "The part of the gun that makes the laser go pew."
-	caliber = "energy"
+	caliber = ENERGY
 	projectile_type = /obj/item/projectile/energy
 	var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot.
 	var/select_name = "energy"