From 4ef2b15c69ad854c1631a0a34efd4a83ae65d2f6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Jun 2019 15:51:37 -0400 Subject: [PATCH 1/5] Update manifest.dm --- code/modules/cargo/exports/manifest.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/cargo/exports/manifest.dm b/code/modules/cargo/exports/manifest.dm index 763ca70dfe..02b060e0bf 100644 --- a/code/modules/cargo/exports/manifest.dm +++ b/code/modules/cargo/exports/manifest.dm @@ -80,13 +80,13 @@ // Paper work done correctly /datum/export/paperwork_correct - cost = 50 + cost = 150 unit_name = "correct paperwork" - export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct) + export_types = list(/obj/item/folder/paperwork_correct) // Paper work not done retruned /datum/export/paperwork_incorrect cost = -500 // Failed to meet NT standers unit_name = "returned incorrect paperwork" - export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork) + export_types = list(/obj/item/folder/paperwork) From e2a3b855b854fd7a03aff0beeb679d29d03cfad6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Jun 2019 15:56:27 -0400 Subject: [PATCH 2/5] Update order.dm --- code/modules/cargo/order.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index 1f0d7d29b3..8776d8f8fc 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -97,12 +97,12 @@ return C //Paperwork for NT -/obj/item/paper/fluff/jobs/cargo/manifest/paperwork +/obj/item/folder/paperwork 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 +/obj/item/folder/paperwork_correct 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' From 7f35a15020e26311c923d34ee02765ad99c2f3e5 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Jun 2019 15:58:13 -0400 Subject: [PATCH 3/5] Update packs.dm --- code/modules/cargo/packs.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 479a8db0ad..83e420bce2 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2671,16 +2671,16 @@ 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 = 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/paper/fluff/jobs/cargo/manifest/paperwork, + contains = list(/obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, + /obj/item/folder/paperwork, /obj/item/pen/fountain, /obj/item/pen/fountain, /obj/item/pen/fountain, From 6fd83df81f97ff8046ca675f9e24eb80084d7123 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Jun 2019 16:00:02 -0400 Subject: [PATCH 4/5] Update recipes.dm --- code/modules/crafting/recipes.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 7d25f67580..a816412207 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -746,10 +746,10 @@ /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! + result = /obj/item/folder/paperwork_correct + time = 60 //Takes time for people to file and complete paper work! reqs = list(/obj/item/pen = 1, - /obj/item/paper/fluff/jobs/cargo/manifest/paperwork = 2) + /obj/item/folder/paperwork = 2) category = CAT_MISC /datum/crafting_recipe/ghettojetpack From a7fe2ca0fffd5a29cbe96d37a818ade4ae42b898 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Jun 2019 16:03:24 -0400 Subject: [PATCH 5/5] paper work icons --- code/modules/cargo/order.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index 8776d8f8fc..b576928bfe 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -101,8 +101,10 @@ 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' + icon_state = "docs_generic" /obj/item/folder/paperwork_correct 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' + icon_state = "docs_verified"