Merge branch 'pr-13067'

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

@@ -168,3 +168,26 @@
 	items = list(
 		/obj/item/clothing/mask/gas/sexymime,
 		/obj/item/clothing/under/rank/civilian/mime/sexy)
+
+/obj/effect/spawner/bundle/crate/Initialize(mapload)
+	if(items && items.len)
+		var/turf/T = get_turf(src)
+		var/obj/structure/closet/LC = locate(/obj/structure/closet) in T
+		if(LC)
+			for(var/path in items)
+				new path(LC)
+	return INITIALIZE_HINT_QDEL
+
+/obj/effect/spawner/bundle/crate/mosin
+	name = "Mosin-Nagant spawner"
+	items = list(
+		/obj/item/gun/ballistic/shotgun/boltaction,
+		/obj/item/ammo_box/a762
+	)
+
+/obj/effect/spawner/bundle/crate/surplusrifle
+	name = "surplus rifle spawner"
+	items = list(
+		/obj/item/gun/ballistic/automatic/surplus,
+		/obj/item/ammo_box/magazine/m10mm/rifle
+	)

code/game/objects/items/storage/toolbox.dm

@@ -245,19 +245,20 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	new /obj/item/stack/cable_coil/white(src)
 
 /obj/item/storage/toolbox/ammo
-	name = "ammo box"
-	desc = "It contains a few clips."
+	name = "ammunition case (7.62mm stripper clips)"
+	desc = "It contains a few 7.62 stripper clips."
 	icon_state = "ammobox"
 	item_state = "ammobox"
+	var/ammotype = /obj/item/ammo_box/a762 // make sure this is a typepath thanks
 
 /obj/item/storage/toolbox/ammo/PopulateContents()
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
-	new /obj/item/ammo_box/a762(src)
+	for (var/i = 0, i < 7, i++)
+		new ammotype(src)
+
+/obj/item/storage/toolbox/ammo/surplus
+	name = "ammunition case (10mm rifle magazines)"
+	desc = "It contains a few 10mm rifle magazines."
+	ammotype = /obj/item/ammo_box/magazine/m10mm/rifle
 
 /obj/item/storage/toolbox/infiltrator
 	name = "insidious case"

code/modules/cargo/packs/armory.dm

@@ -158,11 +158,10 @@
 
 /datum/supply_pack/security/armory/russian
 	name = "Russian Surplus Crate"
-	desc = "Hello Comrade, we have the most modern russian military equipment the black market can offer, for the right price of course. Sadly we couldnt remove the lock so it requires Armory access to open."
+	desc = "Hello Comrade, we have the most modern Russian military equipment the black market can offer, for the right price of course. Sadly we couldn't remove the lock so it requires Armory access to open."
 	cost = 7500
 	contraband = TRUE
 	contains = list(/obj/item/reagent_containers/food/snacks/rationpack,
-					/obj/item/ammo_box/magazine/m10mm/rifle,
 					/obj/item/clothing/suit/armor/vest/russian,
 					/obj/item/clothing/head/helmet/rus_helmet,
 					/obj/item/clothing/shoes/russian,
@@ -172,7 +171,10 @@
 					/obj/item/clothing/mask/russian_balaclava,
 					/obj/item/clothing/head/helmet/rus_ushanka,
 					/obj/item/clothing/suit/armor/vest/russian_coat,
-					/obj/item/gun/ballistic/automatic/surplus)
+					/obj/effect/spawner/bundle/crate/mosin,
+					/obj/item/storage/toolbox/ammo,
+					/obj/effect/spawner/bundle/crate/surplusrifle,
+					/obj/item/storage/toolbox/ammo/surplus)
 	crate_name = "surplus military crate"
 
 /datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C)

code/modules/cargo/packs/security.dm

@@ -100,7 +100,7 @@
 	crate_name = "surplus russian clothing"
 	crate_type = /obj/structure/closet/crate/internals
 
-/datum/supply_pack/security/russianmosin
+/datum/supply_pack/security/russian_partisan
 	name = "Russian Partisan Gear"
 	desc = "An old russian partisan equipment crate, comes with a full russian outfit, a loaded surplus rifle and a second magazine."
 	contraband = TRUE
@@ -112,12 +112,17 @@
 					/obj/item/clothing/suit/armor/bulletproof,
 					/obj/item/clothing/head/helmet/alt,
 					/obj/item/clothing/gloves/tackler/combat/insulated,
-					/obj/item/clothing/mask/gas,
-					/obj/item/ammo_box/magazine/m10mm/rifle,
-					/obj/item/gun/ballistic/automatic/surplus)
+					/obj/item/clothing/mask/gas)
 	crate_name = "surplus russian gear"
 	crate_type = /obj/structure/closet/crate/internals
 
+/datum/supply_pack/security/russian_partisan/fill(obj/structure/closet/crate/C)
+	..()
+	if(prob(20))
+		new /obj/effect/spawner/bundle/crate/mosin(C)
+	else
+		new /obj/effect/spawner/bundle/crate/surplusrifle(C)
+
 /datum/supply_pack/security/sechardsuit
 	name = "Sec Hardsuit"
 	desc = "One Sec Hardsuit with a small air tank and mask."