From 603e2bc1fec14ae9d2ba8a0cce89275f46584b03 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 25 Aug 2016 13:59:30 -0700 Subject: [PATCH 1/4] Since infinite traitor items is okay, I improved it --- code/modules/cargo/packs.dm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index b3fe2ffd114..7da6ba1489c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -147,11 +147,27 @@ name = "NULL_ENTRY" hidden = TRUE cost = 14000 - contains = list(/obj/item/weapon/storage/box/syndicate) + contains = list() crate_name = "emergency crate" crate_type = /obj/structure/closet/crate/internals dangerous = TRUE +/datum/supply_pack/emergency/syndicate/fill(obj/structure/closet/crate/C) + var/list/uplink_items = get_uplink_items() + + var/crate_value = 50 + while(crate_value) + var/category = pick(uplink_items) + var/item = pick(uplink_items[category]) + var/datum/uplink_item/I = uplink_items[category][item] + + if(!I.surplus || prob(100 - I.surplus)) + continue + if(crate_value < I.cost) + continue + crate_value -= I.cost + new I.item(C) + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Security //////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// From 0e5ac350b51b1f4cfa871cf99fd35a313b4e7542 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 25 Aug 2016 14:07:44 -0700 Subject: [PATCH 2/4] Update packs.dm --- code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 7da6ba1489c..2513b83ef1d 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -147,7 +147,7 @@ name = "NULL_ENTRY" hidden = TRUE cost = 14000 - contains = list() + contains = null crate_name = "emergency crate" crate_type = /obj/structure/closet/crate/internals dangerous = TRUE From 3cd5c14ccd5c114dbf894d0e811ddac321de0d0e Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Mon, 29 Aug 2016 12:02:44 -0700 Subject: [PATCH 3/4] Update packs.dm --- code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 2513b83ef1d..7da6ba1489c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -147,7 +147,7 @@ name = "NULL_ENTRY" hidden = TRUE cost = 14000 - contains = null + contains = list() crate_name = "emergency crate" crate_type = /obj/structure/closet/crate/internals dangerous = TRUE From f07472a891893c14df015fed0960377b78108e4c Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Mon, 29 Aug 2016 12:03:16 -0700 Subject: [PATCH 4/4] Update packs.dm --- code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 7da6ba1489c..1abe37a469b 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -153,7 +153,7 @@ dangerous = TRUE /datum/supply_pack/emergency/syndicate/fill(obj/structure/closet/crate/C) - var/list/uplink_items = get_uplink_items() + var/static/list/uplink_items = get_uplink_items() var/crate_value = 50 while(crate_value)