From 2a0a57dcd2382be0d9bb75e608e8ad4f48e1adf3 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 11 Jan 2019 17:56:57 -0500 Subject: [PATCH 1/8] Update manifest.dm --- code/modules/cargo/exports/manifest.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/cargo/exports/manifest.dm b/code/modules/cargo/exports/manifest.dm index d59ef1093f..ce1abf0cbc 100644 --- a/code/modules/cargo/exports/manifest.dm +++ b/code/modules/cargo/exports/manifest.dm @@ -76,3 +76,17 @@ /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 = -50 + unit_name = "correct paperwork" + export_types = list(/obj/item/paper/fluff/jobs/cargo/paperwork_correct) + +// Paper work retruned + +/datum/export/paperwork_correct + cost = 500 // Failed to meet NT standers + unit_name = "retruned late paperwork" + export_types = list(/obj/item/paper/fluff/jobs/cargo/paperwork) From 9a6d3951972b816589bf9d827198df9226ad2f3c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 11 Jan 2019 18:06:12 -0500 Subject: [PATCH 2/8] Update order.dm --- code/modules/cargo/order.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index cef8685027..0fa5116812 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -95,3 +95,14 @@ while(--lost >= 0) qdel(pick(C.contents)) return C + +//Paperwork for NT +/obj/item/paper/fluff/jobs/cargo/manifest/paperwork + name = "Undone Paper work" + desc = "Undone paper work that has been left undone for freelancers to complete." + icon = 'icons/obj/bureaucracy.dmi' + +/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct + name = "Done Paper work" + desc = "Paper work that has been completed, has a nice pen attached to the papers making sure they don't become messy well in travel." + icon = 'icons/obj/bureaucracy.dmi' From 165967416e56bdd4270ca0d5db76a45ff31c5918 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 11 Jan 2019 18:07:39 -0500 Subject: [PATCH 3/8] Update manifest.dm --- code/modules/cargo/exports/manifest.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/exports/manifest.dm b/code/modules/cargo/exports/manifest.dm index ce1abf0cbc..9d12217982 100644 --- a/code/modules/cargo/exports/manifest.dm +++ b/code/modules/cargo/exports/manifest.dm @@ -82,11 +82,11 @@ /datum/export/paperwork_correct cost = -50 unit_name = "correct paperwork" - export_types = list(/obj/item/paper/fluff/jobs/cargo/paperwork_correct) + export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct) // Paper work retruned /datum/export/paperwork_correct cost = 500 // Failed to meet NT standers unit_name = "retruned late paperwork" - export_types = list(/obj/item/paper/fluff/jobs/cargo/paperwork) + export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork) From 1e425c7e40c6615a13a0dd4e59646555676997d8 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 11 Jan 2019 18:17:47 -0500 Subject: [PATCH 4/8] Update packs.dm --- code/modules/cargo/packs.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 1bf41e3d25..3ae15f5a8f 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2412,6 +2412,22 @@ crate_name = "deluxe keg" crate_type = /obj/structure/closet/crate +/datum/supply_pack/misc/paper_work + name = "Freelance Paper work" + desc = "Need a little more credits for that bike for little Timmy? Well I'm willing to pay ya for some accounting that needs to get done. I'll send ya umm ten copies of some paper work and a fountain pens. I want my pens back, send them with the papers or don't get paid! There is two more pens in the box then you will need just in case, keep em or don't." + cost = 400 // Net of 0 credits + contains = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/storage/box/fountainpens) // Two spare pens just in case + crate_name = "paper work" + /datum/supply_pack/misc/toner name = "Toner Crate" desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'" From ba3826af5d6980ee9eac1c59d4a58a4c25f0e38b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 11 Jan 2019 18:23:31 -0500 Subject: [PATCH 5/8] Update recipes.dm --- code/modules/crafting/recipes.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 586819ed8f..533a64b0e8 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -694,10 +694,18 @@ /obj/item/reagent_containers/food/snacks/grown/potato = 1) category = CAT_MISC +/datum/crafting_recipe/paperwork + name = "Filed Paper Work" + result = /obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct + time = 90 //Takes time for people to file and complete paper work! + reqs = list(/obj/item/pen/fountain = 1, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork = 2) + category = CAT_MISC + /datum/crafting_recipe/ghettojetpack name = "Improvised Jetpack" result = /obj/item/tank/jetpack/improvised time = 30 reqs = list(/obj/item/tank/internals/oxygen/red = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = 30)//red oxygen tank so it looks right category = CAT_MISC - tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER) \ No newline at end of file + tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER) From 6ba56c73314da6642b471c3a466fc5280ebea03d Mon Sep 17 00:00:00 2001 From: Ragolution Date: Sat, 12 Jan 2019 15:06:38 -0500 Subject: [PATCH 6/8] Apply suggestions from code reviewer Rag Spell checker Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> --- code/modules/cargo/exports/manifest.dm | 4 ++-- code/modules/cargo/order.dm | 8 ++++---- code/modules/cargo/packs.dm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/cargo/exports/manifest.dm b/code/modules/cargo/exports/manifest.dm index 9d12217982..e6603affba 100644 --- a/code/modules/cargo/exports/manifest.dm +++ b/code/modules/cargo/exports/manifest.dm @@ -86,7 +86,7 @@ // Paper work retruned -/datum/export/paperwork_correct +/datum/export/paperwork_incorrect cost = 500 // Failed to meet NT standers - unit_name = "retruned late paperwork" + unit_name = "returned incorrect paperwork" export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork) diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index 0fa5116812..1f0d7d29b3 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -98,11 +98,11 @@ //Paperwork for NT /obj/item/paper/fluff/jobs/cargo/manifest/paperwork - name = "Undone Paper work" - desc = "Undone paper work that has been left undone for freelancers to complete." + name = "Incomplete Paperwork" + desc = "These should've been filled out four months ago! Unfinished grant papers issued by Nanotrasen's finance department. Complete this page for additional funding." icon = 'icons/obj/bureaucracy.dmi' /obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct - name = "Done Paper work" - desc = "Paper work that has been completed, has a nice pen attached to the papers making sure they don't become messy well in travel." + name = "Finished Paperwork" + desc = "A neat stack of filled-out forms, in triplicate and signed. Is there anything more satisfying? Make sure they get stamped." icon = 'icons/obj/bureaucracy.dmi' diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 3ae15f5a8f..69b0f1ac99 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2414,7 +2414,7 @@ /datum/supply_pack/misc/paper_work name = "Freelance Paper work" - desc = "Need a little more credits for that bike for little Timmy? Well I'm willing to pay ya for some accounting that needs to get done. I'll send ya umm ten copies of some paper work and a fountain pens. I want my pens back, send them with the papers or don't get paid! There is two more pens in the box then you will need just in case, keep em or don't." + 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 = 400 // Net of 0 credits contains = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork, /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, @@ -2426,7 +2426,7 @@ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, /obj/item/storage/box/fountainpens) // Two spare pens just in case - crate_name = "paper work" + crate_name = "Paperwork" /datum/supply_pack/misc/toner name = "Toner Crate" From 2b852a4dec1ef33279029e294ca13e04ff0d47af Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 20 Jan 2019 17:32:56 -0500 Subject: [PATCH 7/8] Update code/modules/crafting/recipes.dm Finnnnneeeee Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> --- code/modules/crafting/recipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 533a64b0e8..750b172286 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -698,7 +698,7 @@ name = "Filed Paper Work" result = /obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct time = 90 //Takes time for people to file and complete paper work! - reqs = list(/obj/item/pen/fountain = 1, + reqs = list(/obj/item/pen = 1, /obj/item/paper/fluff/jobs/cargo/manifest/paperwork = 2) category = CAT_MISC From da7dbe6204ec395c22a225a9f1141ecefa60c5ed Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 20 Jan 2019 17:34:15 -0500 Subject: [PATCH 8/8] Update packs.dm --- code/modules/cargo/packs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 69b0f1ac99..aba2291944 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2425,6 +2425,7 @@ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, + /obj/item/paper/fluff/jobs/cargo/manifest/paperwork, /obj/item/storage/box/fountainpens) // Two spare pens just in case crate_name = "Paperwork"