From 2046ca2eb209277abae6c0ee69d806b76e7da98f Mon Sep 17 00:00:00 2001 From: The0bserver Date: Tue, 13 Apr 2021 19:42:07 -0400 Subject: [PATCH] a test --- code/modules/cargo/packs/armory.dm | 21 +++++++++++++++++++++ code/modules/cargo/packs/goodies.dm | 18 ------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 9f8bb2f25f..5d216e6a41 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -232,3 +232,24 @@ desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids." cost = 1500 contains = list(/obj/item/gun/energy/laser/hellgun) + +/datum/supply_pack/security/armory/esoteric_arms + name = "Esoteric Armory Shipment" + desc = "Well.. you're an agent of taste, I can tell that much. For the right price.. we could see our way clear to send you one of our more... unique weapons." + hidden = TRUE + cost = 10000 + can_private_buy = TRUE + crate_type = /obj/structure/closet/crate + crate_name = "crate" + var/num_contained = 1 + contains = list(/obj/item/gun/ballistic/shotgun/leveraction, + /obj/item/storage/fancy/cigarettes/derringer/gold, + /obj/item/gun/ballistic/revolver/nagant, + /obj/item/gun/ballistic/automatic/pistol/APS, + /obj/item/gun/ballistic/revolver/golden) + +/datum/supply_pack/security/armory/esoteric_arms/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) diff --git a/code/modules/cargo/packs/goodies.dm b/code/modules/cargo/packs/goodies.dm index 9ea0430df3..5d4598fd58 100644 --- a/code/modules/cargo/packs/goodies.dm +++ b/code/modules/cargo/packs/goodies.dm @@ -82,21 +82,3 @@ cost = 500 contains = list(/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/hypospray/medipen/ekit) -/datum/supply_pack/goody/esoteric_arms - name = "Esoteric Armory Shipment" - desc = "Well.. you're an agent of taste, I can tell that much. For the right price.. we could see our way clear to send you one of our more... unique weapons." - hidden = TRUE - cost = 10000 - var/num_contained = 1 - contains = list(/obj/item/gun/ballistic/shotgun/leveraction, - /obj/item/storage/fancy/cigarettes/derringer/gold, - /obj/item/gun/ballistic/revolver/nagant, - /obj/item/gun/ballistic/automatic/pistol/APS, - /obj/item/gun/ballistic/revolver/golden) - -/datum/supply_pack/goody/esoteric_arms/fill(/obj/item/storage/lockbox/order/C) - var/list/L = contains.Copy() - for(var/i in 1 to num_contained) - var/item = pick_n_take(L) - new item(C) -