From ff2fef90a8aad93809453dca6d6d79d648e7309e Mon Sep 17 00:00:00 2001 From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com> Date: Thu, 19 Nov 2020 15:59:34 -0600 Subject: [PATCH] slave for your corporate masters, cargo (#10570) --- code/modules/cargo/bounties/special.dm | 10 +++++----- code/modules/cargo/random_stock/t2_uncommon.dm | 8 ++++---- html/changelogs/doxxmedearly - phornt.yml | 7 +++++++ 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/doxxmedearly - phornt.yml diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm index a9839ad868c..0c8bec753e9 100644 --- a/code/modules/cargo/bounties/special.dm +++ b/code/modules/cargo/bounties/special.dm @@ -26,7 +26,7 @@ description = "Always prioritize this bounty. Failure to meet this quota may result in adverse impact upon your status in the NanoTrasen Corporation." reward_low = 14000 reward_high = 18000 - required_count = 125 + required_count = 150 random_count = 25 wanted_types = list(/obj/item/stack/material/phoron) high_priority = TRUE @@ -44,14 +44,14 @@ /datum/bounty/item/phoron_canister name = "Phoron Canisters" - description = "Always prioritize this bounty. Failure to meet this quota may result in adverse impact upon your status in the NanoTrasen Corporation. Canisters must be filled to at least standard stock amounts." + description = "Updated requirement: Canisters must now be filled to at least 150% of standard stock amounts (approx. 6,800kPA at a temperature of 20C). Always prioritize this bounty. Failure to meet this quota may result in adverse impact upon your status in the NanoTrasen Corporation." reward_low = 15000 reward_high = 18000 - required_count = 4 - random_count = 1 // 3 to 5 + required_count = 5 + random_count = 1 // 4 to 6 wanted_types = list(/obj/machinery/portable_atmospherics/canister) high_priority = TRUE - var/moles_required = 1800 //Roundstart total_moles is about 1871 per tank. This is a small leeway. + var/moles_required = 2700 //Roundstart total_moles is about 1871 per tank. 50% more full w/ leeway /datum/bounty/item/phoron_canister/applies_to(var/obj/machinery/portable_atmospherics/canister/O) if(!..()) diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index f002ee073ce..b9e7144f58a 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -14,11 +14,11 @@ STOCK_ITEM_UNCOMMON(plasteel, 3) STOCK_ITEM_UNCOMMON(silver, 2) new /obj/item/stack/material/silver(L, rand(5,30)) -STOCK_ITEM_UNCOMMON(phoronsheets, 1.5) - new /obj/item/stack/material/phoron(L, rand(5,40)) +STOCK_ITEM_UNCOMMON(phoronsheets, 1) + new /obj/item/stack/material/phoron(L, rand(5,30)) -STOCK_ITEM_UNCOMMON(phoronglass, 2) - new /obj/item/stack/material/glass/phoronglass(L, 50) +STOCK_ITEM_UNCOMMON(phoronglass, 1) + new /obj/item/stack/material/glass/phoronglass(L, rand(10,30)) STOCK_ITEM_UNCOMMON(sandstone, 2) new /obj/item/stack/material/sandstone(L, 50) diff --git a/html/changelogs/doxxmedearly - phornt.yml b/html/changelogs/doxxmedearly - phornt.yml new file mode 100644 index 00000000000..6f38cc603a2 --- /dev/null +++ b/html/changelogs/doxxmedearly - phornt.yml @@ -0,0 +1,7 @@ +author: Doxxmedearly + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +changes: + - tweak: "Adjusted bounties and warehouse spawns regarding phoron to reflect lore developments."