a tonne of fixes

code/modules/projectiles/ammunition/ballistic/lmg.dm

@@ -25,9 +25,9 @@
 /obj/item/ammo_casing/mm712x82/match
 	name = "7.12x82mm match bullet casing"
 	desc = "A 7.12x82mm bullet casing manufactured to unfailingly high standards, you could pull off some cool trickshots with this."
-	projectile_type = /obj/projectile/bullet/mm712x82_match
+	projectile_type = /obj/item/projectile/bullet/mm712x82_match
 
-/obj/projectile/bullet/mm712x82_match
+/obj/item/projectile/bullet/mm712x82_match
 	name = "7.12x82mm match bullet"
 	damage = 40
 	ricochets_max = 2

code/modules/projectiles/ammunition/ballistic/revolver.dm

@@ -15,7 +15,7 @@
 	name = ".357 match bullet casing"
 	desc = "A .357 bullet casing, manufactured to exceedingly high standards."
 	caliber = "357"
-	projectile_type = /obj/projectile/bullet/a357/match
+	projectile_type = /obj/item/projectile/bullet/a357/match
 
 // 7.62x38mmR (Nagant Revolver)
 
@@ -58,14 +58,14 @@
 /obj/item/ammo_casing/c38/match
 	name = ".38 Match bullet casing"
 	desc = "A .38 bullet casing, manufactured to exceedingly high standards."
-	projectile_type = /obj/projectile/bullet/c38/match
+	projectile_type = /obj/item/projectile/bullet/c38/match
 
 /obj/item/ammo_casing/c38/match/bouncy
 	name = ".38 Rubber bullet casing"
 	desc = "A .38 rubber bullet casing, manufactured to exceedingly high standards."
-	projectile_type = /obj/projectile/bullet/c38/match/bouncy
+	projectile_type = /obj/item/projectile/bullet/c38/match/bouncy
 
 /obj/item/ammo_casing/c38/dumdum
 	name = ".38 DumDum bullet casing"
 	desc = "A .38 DumDum bullet casing."
-	projectile_type = /obj/projectile/bullet/c38/dumdum
+	projectile_type = /obj/item/projectile/bullet/c38/dumdum

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -45,6 +45,17 @@
 	desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload."
 	ammo_type = /obj/item/ammo_casing/c38/iceblox
 
+/obj/item/ammo_box/c38/dumdum
+	name = "speed loader (.38 DumDum)"
+	desc = "Designed to quickly reload revolvers. DumDum bullets shatter on impact and shred the target's innards, likely getting caught inside."
+	ammo_type = /obj/item/ammo_casing/c38/dumdum
+
+
+/obj/item/ammo_box/c38/match
+	name = "speed loader (.38 Match)"
+	desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with."
+	ammo_type = /obj/item/ammo_casing/c38/match
+
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	icon_state = "9mmbox"

code/modules/projectiles/projectile.dm

@@ -303,9 +303,9 @@
 	beam_segments[beam_index] = null
 
 /obj/item/projectile/Bump(atom/A)
+	var/datum/point/pcache = trajectory.copy_to()
 	var/turf/T = get_turf(A)
 	if(trajectory && ricochets < ricochets_max && check_ricochet_flag(A) && check_ricochet(A))
-		var/datum/point/pcache = trajectory.copy_to()
 		ricochets++
 		if(A.handle_ricochet(src))
 			on_ricochet(A)
@@ -391,7 +391,7 @@
 		return T
 	//Returns null if nothing at all was found.
 
-/obj/projectile/proc/check_ricochet(atom/A)
+/obj/item/projectile/proc/check_ricochet(atom/A)
 	var/chance = ricochet_chance * A.ricochet_chance_mod
 	if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT))
 		chance += NICE_SHOT_RICOCHET_BONUS

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

@@ -20,7 +20,7 @@
 	ricochet_auto_aim_angle = 10
 	ricochet_auto_aim_range = 3
 
-/obj/projectile/bullet/c38/match
+/obj/item/projectile/bullet/c38/match
 	name = ".38 Match bullet"
 	ricochets_max = 4
 	ricochet_chance = 100
@@ -30,7 +30,7 @@
 	ricochet_decay_chance = 1
 	ricochet_decay_damage = 1
 
-/obj/projectile/bullet/c38/match/bouncy
+/obj/item/projectile/bullet/c38/match/bouncy
 	name = ".38 Rubber bullet"
 	damage = 10
 	stamina = 30
@@ -41,7 +41,7 @@
 	ricochet_decay_damage = 0.8
 	shrapnel_type = NONE
 
-/obj/projectile/bullet/c38/dumdum
+/obj/item/projectile/bullet/c38/dumdum
 	name = ".38 DumDum bullet"
 	damage = 15
 	armour_penetration = -30
@@ -106,7 +106,7 @@
 	armour_penetration = 45
 
 // admin only really, for ocelot memes
-/obj/projectile/bullet/a357/match
+/obj/item/projectile/bullet/a357/match
 	name = ".357 match bullet"
 	ricochets_max = 5
 	ricochet_chance = 140