From 15184f5aa9fbedfc6223f716c060b8bcd8b0c585 Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Wed, 15 Jun 2016 21:50:15 -0700 Subject: [PATCH] Fixes Randomized Crates Fixed issue #15956 Randomized crates now give the correct number of items down from all the items. --- code/modules/cargo/packs.dm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a13aeacffb9..2c542ca575d 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -16,9 +16,14 @@ if(access) C.req_access = list(access) + fill(C) + + return C + +/datum/supply_pack/proc/fill(obj/structure/closet/crate/C) for(var/item in contains) new item(C) - return C + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Emergency /////////////////////////////////////// @@ -1368,6 +1373,13 @@ /obj/item/clothing/head/collectable/petehat) crate_name = "collectable hats crate" +/datum/supply_pack/misc/randomised/fill(obj/structure/closet/crate/C) + var/list/L = contains.Copy() + for(var/i in 1 to num_contained) + var/item = pick_n_take(L) + new item(C) + + /datum/supply_pack/misc/randomised/contraband name = "Contraband Crate" contraband = TRUE