Merge remote-tracking branch 'citadel/master' into combat_v7

code/modules/projectiles/boxes_magazines/internal/derringer.dm

@@ -0,0 +1,30 @@
+/obj/item/ammo_box/magazine/internal/derringer
+	name = "derringer muzzle"
+	ammo_type = /obj/item/ammo_casing/c38
+	caliber = "38"
+	max_ammo = 2
+	multiload = FALSE
+
+/obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1)
+	if (!countempties)
+		var/boolets = 0
+		for(var/obj/item/ammo_casing/bullet in stored_ammo)
+			if(bullet.BB)
+				boolets++
+		return boolets
+	else
+		return ..()
+
+/obj/item/ammo_box/magazine/internal/derringer/a357
+	name = "\improper derringer muzzle"
+	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "357"
+	max_ammo = 2
+	multiload = FALSE
+
+/obj/item/ammo_box/magazine/internal/derringer/g4570
+	name = "\improper derringer muzzle"
+	ammo_type = /obj/item/ammo_casing/g4570
+	caliber = "45-70g"
+	max_ammo = 2
+	multiload = FALSE

code/modules/projectiles/boxes_magazines/internal/shotgun.dm

@@ -55,3 +55,9 @@
 	name = "triple-barrel shotgun internal magazine"
 	ammo_type = /obj/item/ammo_casing/shotgun/incapacitate
 	max_ammo = 3
+
+/obj/item/ammo_box/magazine/internal/shot/levergun
+	name = "levergun internal magazine"
+	ammo_type = /obj/item/ammo_casing/c38 // they're rubber by default, i guess
+	caliber = "38"
+	max_ammo = 7