From 83a66e6137fb5865f1d93ef2b4974c67d82af9f9 Mon Sep 17 00:00:00 2001 From: KoboldCommando Date: Thu, 9 Mar 2023 11:09:56 -0500 Subject: [PATCH 1/4] adds some crates! --- monkestation/code/modules/cargo/packs.dm | 111 +++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/monkestation/code/modules/cargo/packs.dm b/monkestation/code/modules/cargo/packs.dm index 6b3d8e5efea3a..c369f9671980f 100644 --- a/monkestation/code/modules/cargo/packs.dm +++ b/monkestation/code/modules/cargo/packs.dm @@ -1,3 +1,103 @@ +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Armory ////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/security/armory/revolver + name = "Revolver Single-Pack" + desc = "Contains one revolver, of the sort detectives are known to habitually smuggle on board. Ammo not included." + cost = 1000 + contraband = TRUE + small_item = TRUE + contains = list(/obj/item/gun/ballistic/revolver/detective) + crate_name = "single revolver crate" + +////////////////////////////////////////////////////////////////////////////// +/////////////////////// Canisters & Materials //////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/materials/randommaterials + name = "Contracted Materials" + desc = "No miners? We'll contract the work and send you the materials! Contains random processed materials, good luck!" + cost = 3000 + contains = list() + crate_name = "contracted materials crate" + +/datum/supply_pack/materials/randommaterials/fill(obj/structure/closet/crate/C) + for(var/i in 1 to 5) + var/item = pick( + prob(200); + /obj/item/stack/sheet/iron/fifty, + prob(100); + /obj/item/stack/sheet/glass/fifty, + prob(50); + /obj/item/stack/sheet/plastic/fifty, + prob(50); + /obj/item/stack/sheet/mineral/copper/twenty, + prob(50); + /obj/item/stack/sheet/mineral/plasma/twenty, + prob(20); + /obj/item/stack/sheet/plasteel/twenty, + prob(20); + /obj/item/stack/sheet/mineral/titanium/twenty, + prob(10); + /obj/item/stack/sheet/mineral/silver/twenty, + prob(10); + /obj/item/stack/sheet/mineral/gold/five, + prob(5); + /obj/item/stack/sheet/mineral/diamond/five, + prob(5); + /obj/item/stack/sheet/mineral/uranium/five, + prob(5); + /obj/item/stack/sheet/bluespace_crystal/five + ) + new item(C) + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Medical ///////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/medical/cadaver + name = "Cadaver Crate" + desc = "We won't ask why you need it if you don't ask why it's contraband. Contents not guaranteed deceased." + cost = 700 + contraband = TRUE + contains = list(/mob/living/carbon/human/) + crate_name = "cadaver freezer" + crate_type = /obj/structure/closet/crate/freezer + +/datum/supply_pack/medical/ass + name = "Ass Crate" + desc = "What's that smell? Why it's the ass crate of course! For when your coworkers have had prolific posterior pains. Contains abundant assorted asses." + cost = 800 + contraband = TRUE + contains = list() + crate_name = "ass crate" + crate_type = /obj/structure/closet/crate/freezer + +/datum/supply_pack/medical/ass/fill(obj/structure/closet/crate/C) + for(var/i in 1 to 6) + var/item = pick( + prob(200); + /obj/item/organ/butt, + prob(20); + /obj/item/organ/butt/cyber, + prob(20); + /obj/item/organ/butt/iron, + prob(20); + /obj/item/organ/butt/skeletal, + prob(10); + /obj/item/organ/butt/clown, + prob(10); + /obj/item/organ/butt/plasma, + prob(5); + /obj/item/organ/butt/bluespace, + prob(5); + /obj/item/organ/butt/xeno, + prob(1); + /obj/item/organ/butt/atomic + ) + new item(C) + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Miscellaneous /////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -50,3 +150,14 @@ crate_name = "Experimental Cloner Crate" crate_type = /obj/structure/closet/crate/medical dangerous = TRUE + +/datum/supply_pack/misc/cratecrate + name = "Crate crate" + desc = "A crate full of crates. Why? How?" + cost = 2000 + access = FALSE + contains = list(/obj/structure/closet/crate, + /obj/structure/closet/crate, + /obj/structure/closet/crate) + crate_name = "Crate Crate" + crate_type = /obj/structure/closet/crate From f13642fe7d5d606c1fe9faf08fed5e6b6d8a97da Mon Sep 17 00:00:00 2001 From: KoboldCommando Date: Thu, 9 Mar 2023 11:15:59 -0500 Subject: [PATCH 2/4] This should be snake_case --- monkestation/code/modules/cargo/packs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monkestation/code/modules/cargo/packs.dm b/monkestation/code/modules/cargo/packs.dm index c369f9671980f..66b115df0dfb8 100644 --- a/monkestation/code/modules/cargo/packs.dm +++ b/monkestation/code/modules/cargo/packs.dm @@ -15,14 +15,14 @@ /////////////////////// Canisters & Materials //////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -/datum/supply_pack/materials/randommaterials +/datum/supply_pack/materials/random_materials name = "Contracted Materials" desc = "No miners? We'll contract the work and send you the materials! Contains random processed materials, good luck!" cost = 3000 contains = list() crate_name = "contracted materials crate" -/datum/supply_pack/materials/randommaterials/fill(obj/structure/closet/crate/C) +/datum/supply_pack/materials/random_materials/fill(obj/structure/closet/crate/C) for(var/i in 1 to 5) var/item = pick( prob(200); From 871c05aeb352fab2928ccc8de83d73a200efce80 Mon Sep 17 00:00:00 2001 From: KoboldCommando Date: Thu, 9 Mar 2023 12:28:43 -0500 Subject: [PATCH 3/4] revolver description --- monkestation/code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/modules/cargo/packs.dm b/monkestation/code/modules/cargo/packs.dm index 66b115df0dfb8..ff33450316c21 100644 --- a/monkestation/code/modules/cargo/packs.dm +++ b/monkestation/code/modules/cargo/packs.dm @@ -4,7 +4,7 @@ /datum/supply_pack/security/armory/revolver name = "Revolver Single-Pack" - desc = "Contains one revolver, of the sort detectives are known to habitually smuggle on board. Ammo not included." + desc = "Contains one revolver, of the sort detectives are known to habitually smuggle on board." cost = 1000 contraband = TRUE small_item = TRUE From 51d60b8fd8aa462681c572d77ce33955aa83a71d Mon Sep 17 00:00:00 2001 From: KoboldCommando Date: Fri, 10 Mar 2023 17:21:38 -0500 Subject: [PATCH 4/4] raises revolver price --- monkestation/code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/modules/cargo/packs.dm b/monkestation/code/modules/cargo/packs.dm index ff33450316c21..80c9cf07e78e3 100644 --- a/monkestation/code/modules/cargo/packs.dm +++ b/monkestation/code/modules/cargo/packs.dm @@ -5,7 +5,7 @@ /datum/supply_pack/security/armory/revolver name = "Revolver Single-Pack" desc = "Contains one revolver, of the sort detectives are known to habitually smuggle on board." - cost = 1000 + cost = 1500 contraband = TRUE small_item = TRUE contains = list(/obj/item/gun/ballistic/revolver/detective)