From 65899bf90668d98a020fee8261572da293107ba3 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sun, 3 May 2020 19:56:00 +0200 Subject: [PATCH] Removing cargo "paperwork" and a few other bloat packs. --- .../crafting/recipes/recipes_misc.dm | 9 ------- code/game/objects/structures/loom.dm | 3 --- code/modules/cargo/exports/manifest.dm | 16 ----------- code/modules/cargo/packs/materials.dm | 8 ------ code/modules/cargo/packs/misc.dm | 27 +------------------ 5 files changed, 1 insertion(+), 62 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index 9eb3fcaaea..cca1682723 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -404,15 +404,6 @@ subcategory = CAT_MISCELLANEOUS category = CAT_MISC -/datum/crafting_recipe/paperwork - name = "Filed Paper Work" - result = /obj/item/folder/paperwork_correct - time = 10 //Takes time for people to file and complete paper work! - tools = list(/obj/item/pen) - reqs = list(/obj/item/folder/paperwork = 1) - subcategory = CAT_MISCELLANEOUS - category = CAT_MISC - /datum/crafting_recipe/coconut_bong name = "Coconut Bong" result = /obj/item/bong/coconut diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm index 2244742f3a..ad128b01c2 100644 --- a/code/game/objects/structures/loom.dm +++ b/code/game/objects/structures/loom.dm @@ -38,7 +38,4 @@ user.show_message("You weave \the [S.name] into a workable fabric.", MSG_VISUAL) return TRUE -/obj/structure/loom/unanchored - anchored = FALSE - #undef FABRIC_PER_SHEET \ No newline at end of file diff --git a/code/modules/cargo/exports/manifest.dm b/code/modules/cargo/exports/manifest.dm index 60515781f9..d59ef1093f 100644 --- a/code/modules/cargo/exports/manifest.dm +++ b/code/modules/cargo/exports/manifest.dm @@ -76,19 +76,3 @@ /datum/export/manifest_correct_denied/get_cost(obj/O) var/obj/item/paper/fluff/jobs/cargo/manifest/M = O return ..() - M.order_cost - -// Paper work done correctly - -/datum/export/paperwork_correct - cost = 120 // finicky number 20 x 120 = 2400 per crate - k_elasticity = 0 - unit_name = "correct paperwork" - export_types = list(/obj/item/folder/paperwork_correct) - -// Paper work not done retruned - -/datum/export/paperwork_incorrect - cost = -500 // Failed to meet NT standers - k_elasticity = 0 - unit_name = "returned incorrect paperwork" - export_types = list(/obj/item/folder/paperwork) diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm index 6c1742896f..1ce3a6b084 100644 --- a/code/modules/cargo/packs/materials.dm +++ b/code/modules/cargo/packs/materials.dm @@ -129,14 +129,6 @@ /obj/item/rcd_ammo) crate_name = "rcd ammo" -/datum/supply_pack/materials/loom - name = "Loom" - desc = "A large pre-made loom." - cost = 1000 - contains = list(/obj/structure/loom/unanchored) - crate_name = "loom crate" - crate_type = /obj/structure/closet/crate/large - ////////////////////////////////////////////////////////////////////////////// ///////////////////////////// Canisters ////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index dfaa6f0027..5265b2c2f6 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -87,37 +87,12 @@ crate_type = /obj/structure/closet/crate/wooden crate_name = "calligraphy crate" -/datum/supply_pack/misc/paper_work - name = "Freelance Paper work" - desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (10) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up. - cost = 700 // Net of 0 credits but makes (120 x 10 = 1200) - contains = list(/obj/item/folder/paperwork, - /obj/item/pen/fountain - ) - crate_name = "Paperwork" - -/datum/supply_pack/misc/paper_work/generate() - . = ..() - for(var/i in 1 to 9) - new /obj/item/folder/paperwork(.) ////////////////////////////////////////////////////////////////////////////// //////////////////////////////// Entertainment /////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -/datum/supply_pack/misc/randombedsheets - name = "Bedsheet Crate (R)" - desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" - cost = 2000 - contains = list(/obj/item/bedsheet/random) - crate_name = "random bedsheet crate" - -/datum/supply_pack/misc/randombedsheets/generate() - . = ..() - for(var/i in 1 to 7) - new /obj/item/bedsheet/random(.) - /datum/supply_pack/misc/coloredsheets - name = "Bedsheet Crate (C)" + name = "Bedsheet Crate" desc = "Give your night life a splash of color with this crate filled with bedsheets! Contains a total of nine different-colored sheets." cost = 1250 contains = list(/obj/item/bedsheet/blue,