From f175aa1868e2334157f1993efe752f907bcad030 Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Thu, 28 Apr 2022 16:04:51 -0400
Subject: [PATCH] Adjusts phoron scarcity bounties (#13561)

---
 code/modules/cargo/bounties/special.dm        | 29 ++-----------------
 code/modules/cargo/bounty.dm                  |  2 +-
 html/changelogs/doxxmedearly-phoronbounty.yml |  7 +++++
 3 files changed, 11 insertions(+), 27 deletions(-)
 create mode 100644 html/changelogs/doxxmedearly-phoronbounty.yml

diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm
index d9538afb2cc..a80faf5d820 100644
--- a/code/modules/cargo/bounties/special.dm
+++ b/code/modules/cargo/bounties/special.dm
@@ -19,11 +19,11 @@
 		for(var/i = 0; i < reward; ++i)
 			SScargo.try_add_bounty(SScargo.random_bounty())
 
-//during phoron scarcity lore arc. remove when lore permits.
+//Part of the Horizon's operations is to secure phoron, so high priority.
 
 /datum/bounty/item/phoron_sheet
 	name = "Phoron Sheets"
-	description = "Always prioritize this bounty. Failure to meet this quota may result in adverse impact upon your status in the NanoTrasen Corporation."
+	description = "Shipment of Phoron is considered to be a key part of the SCCV Horizon's operations within the CRZ. This bounty should always be prioritized."
 	reward_low = 2600
 	reward_high = 3750
 	required_count = 40
@@ -34,7 +34,7 @@
 /datum/bounty/item/phoron_sheet/New()
 	..()
 	required_count = round(required_count, 10)
-	//Temporarily overwrite the normal price randomization because the random_count is so high. There would be absolutely nuts price fluctuation. It's a temporary bounty anyway.
+	//Overwrite the normal price randomization because the random_count is so high. There would be absolutely nuts price fluctuation. 
 	reward = round(rand(reward_low, reward_high), 100)
 
 /datum/bounty/item/phoron_sheet/ship(var/obj/item/stack/material/phoron/O)
@@ -42,29 +42,6 @@
 		return
 	shipped_count += O.amount
 
-/datum/bounty/item/phoron_canister
-	name = "Phoron Canisters"
-	description = "Updated requirement: Canisters must now be filled to a minimum of 2000 moles. Always prioritize this bounty. Failure to meet this quota may result in adverse impact upon your status in the NanoTrasen Corporation."
-	reward_low = 8000
-	reward_high = 10000
-	required_count = 3
-	random_count = 1 // 2 to 4
-	wanted_types = list(/obj/machinery/portable_atmospherics/canister)
-	high_priority = TRUE
-	var/moles_required = 2000 //Roundstart total_moles for a FULL tank is about 1871 per tank. However during the arc this bounty is relevant, tanks are half full.
-
-/datum/bounty/item/phoron_canister/applies_to(var/obj/machinery/portable_atmospherics/canister/O)
-	if(!..())
-		return FALSE
-	if(!istype(O))
-		return FALSE
-
-	var/datum/gas_mixture/environment = O.return_air()
-	if(!environment || !O.air_contents.gas["phoron"])
-		return FALSE
-
-	return O.air_contents.gas["phoron"] >= moles_required
-
 /datum/bounty/item/solar_array
 	name = "Assembled Solar Panels"
 	description = "Owing to the phoron shortage continuing for over a year, longer than projected, we have decided to use solar arrays to power various facilities across our region of influence."
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index d4939a120c7..ab26a008b0b 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -210,7 +210,7 @@
 	try_add_bounty(new r_subtype)
 
 	if(prob(60))
-		//phoron arc bounties. remove when arc is done.
+		//phoron bounties
 		var/datum/bounty/item/phoron_bounty = pick(/datum/bounty/item/phoron_sheet, /datum/bounty/item/solar_array)
 		try_add_bounty(new phoron_bounty)
 	else
diff --git a/html/changelogs/doxxmedearly-phoronbounty.yml b/html/changelogs/doxxmedearly-phoronbounty.yml
new file mode 100644
index 00000000000..ad575c41b36
--- /dev/null
+++ b/html/changelogs/doxxmedearly-phoronbounty.yml
@@ -0,0 +1,7 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes:
+  - tweak: "Edited the wording of the phoron-related bounties to more accurately represent current lore."
+  - rscdel: "Removes the phoron canister bounty."
\ No newline at end of file