Ballistic Lootpools Rebalancing, niche ammo returns.

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -345,6 +345,7 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
+
 /*
 /datum/crafting_recipe/c38boxincin
 	name = ".38 incendiary-tipped ammo box"
@@ -359,6 +360,7 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 */
+
 /datum/crafting_recipe/c10mmincin
 	name = "10mm incendiary-tipped ammo box"
 	result = /obj/item/ammo_box/c10mm/fire
@@ -451,7 +453,7 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-
+/*
 /datum/crafting_recipe/a556shrap
 	name = "5.56mm micro-shrapnel ammo box"
 	result = /obj/item/ammo_box/a556/microshrapnel
@@ -464,7 +466,7 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-/*
+*/
 /datum/crafting_recipe/a556uranium
 	name = "5.56mm uranium-tipped ammo box"
 	result = /obj/item/ammo_box/a556/uraniumtipped
@@ -478,11 +480,10 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-*/
-/*
+
 /datum/crafting_recipe/a762boxirr
 	name = "7.62 U-235 ammo box"
-	result = /obj/item/ammo_box/a762box/uraniumtipped
+	result = /obj/item/ammo_box/a308box/uraniumtipped
 	reqs = list(/obj/item/stack/crafting/metalparts = 1,
 	/obj/item/stack/sheet/mineral/titanium = 1,
 	/obj/item/stack/sheet/prewar = 1,
@@ -493,11 +494,10 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-*/
 /*
 /datum/crafting_recipe/a762boxshrap
 	name = "7.62mm micro-shrapnel ammo box"
-	result = /obj/item/ammo_box/a762box/microshrapnel
+	result = /obj/item/ammo_box/a308box/microshrapnel
 	reqs = list(/obj/item/stack/crafting/metalparts = 1,
 	/obj/item/stack/sheet/prewar = 2,
 	/obj/item/stack/sheet/mineral/titanium = 1,
@@ -508,7 +508,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 */
-/*
 /datum/crafting_recipe/a50MGboxuranium
 	name = "12.7mm U-235 ammo box"
 	result = /obj/item/ammo_box/a50MGbox/uraniumtipped
@@ -522,7 +521,6 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-*/
 
 /datum/crafting_recipe/a50MGboxcontaminated
 	name = "12.7mm contaminated ammo box"

code/game/objects/effects/spawners/f13lootdrop.dm

@@ -863,13 +863,15 @@
 				/obj/effect/spawner/bundle/f13/colt357,
 				/obj/effect/spawner/bundle/f13/huntingshotgun,
 				/obj/effect/spawner/bundle/f13/police_pistol,
-				/obj/effect/spawner/bundle/f13/m1carbine
+				/obj/effect/spawner/bundle/f13/m1carbine,
+				/obj/item/gun/ballistic/automatic/varmint/bushmaster_arm_gun,
+				/obj/item/gun/ballistic/automatic/m1carbine/m2,
+				/obj/item/gun/ballistic/automatic/smg/mini_uzi/owengun,
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/lowmid
 	name = "low-mid tier ballistic gun"
-	loot = list(/obj/effect/spawner/bundle/f13/n99,
-				/obj/effect/spawner/bundle/f13/cowboy,
+	loot = list(/obj/effect/spawner/bundle/f13/cowboy,
 				/obj/effect/spawner/bundle/f13/mk23,
 				/obj/effect/spawner/bundle/f13/needler,
 				/obj/effect/spawner/bundle/f13/hunting,
@@ -878,7 +880,9 @@
 				/obj/effect/spawner/bundle/f13/m1carbine,
 				/obj/effect/spawner/bundle/f13/huntingshotgun,
 				/obj/effect/spawner/bundle/f13/revolver45,
-				/obj/effect/spawner/bundle/f13/beretta/select
+				/obj/effect/spawner/bundle/f13/beretta/select,
+				/obj/item/gun/ballistic/automatic/sportcarbine/m1_22,
+				/obj/item/gun/ballistic/rifle/mosin
 		)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/mid
@@ -892,7 +896,10 @@
 				/obj/effect/spawner/bundle/f13/automag,
 				/obj/item/gun/ballistic/automatic/smg/american180,
 				/obj/item/gun/ballistic/rifle/repeater/ranger,
-				/obj/item/gun/ballistic/automatic/smg/ppsh
+				/obj/item/gun/ballistic/automatic/smg/ppsh,
+				/obj/item/gun/ballistic/automatic/smg/sidewinder,
+				/obj/item/gun/ballistic/automatic/smg/mini_uzi/mp40,
+				/obj/item/gun/ballistic/automatic/smg/mini_uzi/mac10,
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/highmid
@@ -903,14 +910,17 @@
 				/obj/effect/spawner/bundle/f13/guns/tommygun,
 				/obj/effect/spawner/bundle/f13/shotgunlever,
 				/obj/effect/spawner/bundle/f13/brushgun,
-				/obj/effect/spawner/bundle/f13/ak112
+				/obj/effect/spawner/bundle/f13/ak112,
+				/obj/item/gun/ballistic/automatic/varmint/ratslayer,
+				/obj/item/gun/ballistic/automatic/smg/sidewinder/magnum,
+				/obj/item/gun/ballistic/automatic/wt550,
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/high
 	name = "high tier ballistic gun"
-	loot = list(/obj/effect/spawner/bundle/f13/assault_rifle = 20,
-				/obj/effect/spawner/bundle/f13/r84 = 10,
-				/obj/effect/spawner/bundle/f13/brushgun = 15,
+	loot = list(/obj/effect/spawner/bundle/f13/assault_rifle = 10,
+				/obj/effect/spawner/bundle/f13/riotshotgun = 10,
+				/obj/effect/spawner/bundle/f13/brushgun = 20,
 				/obj/effect/spawner/bundle/f13/m14 = 5,
 				/obj/effect/spawner/bundle/f13/assault_carbine = 5,
 				/obj/effect/spawner/bundle/f13/magnumrevolver = 15,
@@ -920,17 +930,20 @@
 				/obj/item/gun/ballistic/shotgun/automatic/combat/citykiller = 10,
 				/obj/effect/spawner/bundle/f13/guns/p90 = 5,
 				/obj/item/gun/ballistic/automatic/lsw = 5,
-				/obj/item/gun/ballistic/automatic/lewis/lanoe = 5
+				/obj/item/gun/ballistic/automatic/lewis/lanoe = 5,
+				/obj/item/gun/ballistic/automatic/xl70e3 = 5,
+				/obj/item/gun/ballistic/automatic/shotgun/pancor = 10,
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/superhigh
 	name = "superhigh tier ballistic gun"
-	loot = list(/obj/effect/spawner/bundle/f13/riotshotgun = 10,
+	loot = list(/obj/effect/spawner/bundle/f13/r84 = 10,
 				/obj/item/gun/ballistic/automatic/bozar = 10,
 				/obj/effect/spawner/bundle/f13/amr = 10,
 				/obj/effect/spawner/bundle/f13/bar = 10,
 				/obj/item/gun/ballistic/rocketlauncher = 10,
 				/obj/item/gun/ballistic/automatic/g11 = 5,
+				/obj/item/gun/ballistic/automatic/smg/smg14 = 5,
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/unique
@@ -946,7 +959,8 @@
 				/obj/item/gun/ballistic/automatic/m1garand/oldglory,
 				/obj/item/gun/ballistic/automatic/pistol/pistol14/lildevil,
 				/obj/item/gun/ballistic/shotgun/automatic/combat/neostead,
-				/obj/item/gun/ballistic/revolver/ghoulgun
+				/obj/item/gun/ballistic/revolver/ghoulgun,
+				/obj/item/gun/ballistic/automatic/g11/tox
 				)
 
 

code/game/objects/items/shrapnel.dm

@@ -99,9 +99,10 @@
 	damage = 10
 	wound_bonus = 30
 	sharpness = SHARP_EDGED
-
+/*
 /obj/item/shrapnel/bullet/a556/microshrapnel
 	name = "\improper 5.56mm microshrapnel bullet"
 
 /obj/item/shrapnel/bullet/a762/microshrapnel
 	name = "\improper 7.62mm microshrapnel bullet"
+*/

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

@@ -39,12 +39,13 @@
 	desc = "Like shrapnel, but smaller, and thus more annoying."
 	projectile_type = /obj/item/projectile/bullet/a308/microshrapnel
 	fire_power = CASING_POWER_MEDIUM_RIFLE * CASING_POWER_MOD_MATCH
+*/
 
-/obj/item/ammo_casing/a762/uraniumtipped
+/obj/item/ammo_casing/a308/uraniumtipped
 	name = "7.62 uranium tipped bullet casing"
 	desc = "Not depleted uranium. Regular uranium."
-	projectile_type = /obj/item/projectile/bullet/a762/uraniumtipped
-*/
+	projectile_type = /obj/item/projectile/bullet/a308/uraniumtipped
+
 
 /obj/item/ammo_casing/a308/rubber
 	name = ".308 rubber bullet casing"
@@ -105,19 +106,19 @@
 		/datum/material/iron = (MATS_RIFLE_LIGHT_CASING * MATS_AMMO_CASING_HANDLOAD_MULT) + (MATS_RIFLE_LIGHT_BULLET * MATS_AMMO_BULLET_HANDLOAD_MULT),
 		/datum/material/blackpowder = MATS_RIFLE_LIGHT_POWDER * MATS_AMMO_POWDER_HANDLOAD_MULT)
 	fire_power = CASING_POWER_LIGHT_RIFLE * CASING_POWER_MOD_HANDLOAD
-
+/*
 /obj/item/ammo_casing/a556/microshrapnel
 	name = "5.56mm microshrapnel bullet casing"
 	desc = "Like shrapnel, but smaller, and thus more annoying."
 	projectile_type = /obj/item/projectile/bullet/a556/microshrapnel
 	fire_power = CASING_POWER_LIGHT_RIFLE * CASING_POWER_MOD_MATCH
+*/
 
-/*
 /obj/item/ammo_casing/a556/uranium_tipped
 	name = "5.56 uranium-tipped bullet casing"
 	desc = "Tax money well spent."
 	projectile_type = /obj/item/projectile/bullet/a556/uraniumtipped
-*/
+
 /*
 /obj/item/ammo_casing/a556/sport //.223
 	name = ".223 bullet casing"

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

@@ -66,10 +66,10 @@
 	projectile_type = /obj/item/projectile/bullet/a50MG/contam
 	fire_power = CASING_POWER_HEAVY_RIFLE * CASING_POWER_MOD_MATCH
 
-/*
+
 /obj/item/ammo_casing/a50MG/uraniumtipped
 	name = "12.7mm uranium-tipped bullet casing"
 	desc = "Enriched uranium-tipped 12.7mm rifle rounds."
 	projectile_type = /obj/item/projectile/bullet/a50MG/uraniumtipped
 	icon_state = "50ap2"
-*/
+

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

@@ -27,11 +27,9 @@
 	projectile_type  = /obj/item/projectile/bullet/a473/incendiary
 	fire_power = CASING_POWER_LIGHT_RIFLE * CASING_POWER_MOD_HANDLOAD
 
-/*
 /obj/item/ammo_casing/caseless/g11/uraniumtipped
 	name = "4.73mm U-235 cartridge"
 	projectile_type  = /obj/item/projectile/bullet/a473/uraniumtipped
-*/
 
 /obj/item/ammo_casing/caseless/g11/dumdum
 	name = "4.73mm flat-nose cartridge"

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -407,13 +407,12 @@
 	icon_state = "556box"
 	multiple_sprites = 2
 	ammo_type = /obj/item/ammo_casing/a556/rubber
-
+/*
 /obj/item/ammo_box/a556/microshrapnel
 	name = "ammo box (5.56 microshrapnel)"
 	desc = "Now with fragments!"
 	ammo_type = /obj/item/ammo_casing/a556/microshrapnel
-
-/*
+*/
 /obj/item/ammo_box/a556/uraniumtipped
 	name = "ammo box (5.56 uranium-tipped)"
 	desc = "Not depleted uranium. Regular uranium."
@@ -428,7 +427,6 @@
 /obj/item/ammo_box/a762box/uraniumtipped/Destroy()
 	STOP_PROCESSING(SSradiation,src)
 	..()
-*/
 
 /obj/item/ammo_box/a556/improvised
 	name = "bag with reloaded 5.56 bullets"
@@ -484,6 +482,7 @@
 	icon_state = "improvshotbag"
 	max_ammo = 15
 	multiple_sprites = 3
+
 /*
 /obj/item/ammo_box/a762box
 	name = "ammo box (7.62x51 FMJ Match)"
@@ -495,33 +494,35 @@
 	max_ammo = 20
 	w_class = WEIGHT_CLASS_SMALL
 	custom_materials = list(/datum/material/iron = MATS_RIFLE_MEDIUM_BOX)
+*/
 
-/obj/item/ammo_box/a762box/uraniumtipped
-	name = "ammo box (7.62x51 uranium tipped)"
-	ammo_type = /obj/item/ammo_casing/a762/uraniumtipped
+/obj/item/ammo_box/a308box/uraniumtipped
+	name = "ammo box (.308 uranium tipped)"
+	ammo_type = /obj/item/ammo_casing/a308/uraniumtipped
 	desc = "Not depleted uranium. Regular uranium."
+	icon_state = "762box"
 
-/obj/item/ammo_box/a762box/uraniumtipped/Initialize()
+/obj/item/ammo_box/a308box/uraniumtipped/Initialize()
 	. = ..()
 	AddComponent(/datum/component/radioactive, 5, src, 0, TRUE, TRUE) //half-life of 0 because we keep on going.
 	START_PROCESSING(SSradiation,src)
 
-/obj/item/ammo_box/a762box/uraniumtipped/Destroy()
+/obj/item/ammo_box/a308box/uraniumtipped/Destroy()
 	STOP_PROCESSING(SSradiation,src)
 	..()
-
+/*
 /obj/item/ammo_box/a308box/microshrapnel
 	name = "ammo box (.308 microshrapnel)"
 	desc = "Now with EVEN MORE fragments!"
 	ammo_type = /obj/item/ammo_casing/a308/microshrapnel
-
+*/
 /obj/item/ammo_box/a308box/rubber
 	name = "ammo box (.308 rubber)"
 	icon = 'icons/fallout/objects/guns/ammo.dmi'
 	icon_state = "762box"
 	multiple_sprites = 2
 	ammo_type = /obj/item/ammo_casing/a308/rubber
-*/
+
 
 //.50 MG and 14mm
 /obj/item/ammo_box/a50MGbox
@@ -555,13 +556,11 @@
 	desc = "12.7mm bullets loaded with a gaseous hepatoxic payload, which reduces the effectiveness of medicine and toxins."
 	ammo_type = /obj/item/ammo_casing/a50MG/contam
 
-/*
 /obj/item/ammo_box/a50MGbox/uraniumtipped
 	name = "ammo box (12.7mm uranium-tipped)"
 	max_ammo = 15
 	desc = "12.7mm bullets loaded with enriched-uranium penetrators."
 	ammo_type = /obj/item/ammo_casing/a50MG/uraniumtipped
-*/
 
 /obj/item/ammo_box/m14mm
 	name = "ammo box (14mm)"
@@ -606,11 +605,9 @@
 	name = "ammo box (4.73mm incendiary)"
 	ammo_type = /obj/item/ammo_casing/caseless/g11/incendiary
 
-/*
 /obj/item/ammo_box/m473/uraniumtipped
 	name = "ammo box (4.73mm uranium-tipped)"
 	ammo_type = /obj/item/ammo_casing/caseless/g11/uraniumtipped
-*/
 
 /obj/item/ammo_box/m473/dumdum
 	name = "ammo box (4.73mm flat-nose)"
@@ -1013,7 +1010,6 @@
 	max_ammo = 5
 	multiple_sprites = 1
 
-
 /obj/item/ammo_box/a50MG/explosive
 	name = "anti-materiel explosive ammo rack (.50MG)"
 	desc = "5 rounds of explosive .50 MG. More then enough to kill anything that moves."
@@ -1028,13 +1024,11 @@
 	ammo_type = /obj/item/ammo_casing/a50MG/penetrator
 	icon_state = "50ap"
 
-/*
 /obj/item/ammo_box/a50MG/uraniumtipped
 	name = "anti-materiel uranium-tipped ammo rack (.50MG)"
 	desc = "5 rounds of uranium-tipped .50 MG, when you really want something to remember what it was like back in '77.'"
 	ammo_type = /obj/item/ammo_casing/a50MG/uraniumtipped
 	icon_state = "50ap"
-*/
 
 ////////////////////////////////
 // FLAMER FUEL AND OTHER MISC //