From d1671f70385074ee15db5e6c38d8a0e8ba08ce9f Mon Sep 17 00:00:00 2001
From: Batrachophreno <Batrochophreno@gmail.com>
Date: Sat, 14 Feb 2026 03:52:48 -0500
Subject: [PATCH] I'm seriously sick of having a SECOND solar panel bounty that
 requires them to be assembled and I'm finally doing something about it
 (#21821)

changes:
- rscdel: "Removes 'Assembled Solar Panels' bounty from bounty pool and
updates the 'Solar Assemblies or Trackers' with its old description
referencing the phoron scarcity."
---
 code/modules/cargo/bounties/engineer.dm  |  2 +-
 code/modules/cargo/bounties/special.dm   | 10 ----
 code/modules/cargo/bounty.dm             |  2 +-
 html/changelogs/Bat-SolarPanelBounty.yml | 58 ++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 html/changelogs/Bat-SolarPanelBounty.yml

diff --git a/code/modules/cargo/bounties/engineer.dm b/code/modules/cargo/bounties/engineer.dm
index 6d2f9653fcc..02b05cd0d3e 100644
--- a/code/modules/cargo/bounties/engineer.dm
+++ b/code/modules/cargo/bounties/engineer.dm
@@ -25,7 +25,7 @@
 
 /datum/bounty/item/engineer/solar
 	name = "Solar Assemblies or Trackers"
-	description = "A meteor shower ruined some backup solar arrays on the %DOCKNAME; ship us some assemblies or tracker electronics so we can expedite repairs."
+	description = "Owing to the ongoing phoron scarcity, additional hardware has been requested by several facilities within our region of influence for the expansion of their solar arrays."
 	reward_low = 650
 	reward_high = 870
 	required_count = 6
diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm
index cd93c05f49b..9ee87225038 100644
--- a/code/modules/cargo/bounties/special.dm
+++ b/code/modules/cargo/bounties/special.dm
@@ -41,13 +41,3 @@
 	if(!applies_to(O))
 		return
 	shipped_count += O.amount
-
-/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."
-	reward_low = 280
-	reward_high = 400
-	required_count = 6
-	random_count = 2 // 4 to 8
-	wanted_types = list(/obj/machinery/power/solar)
-	high_priority = TRUE
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index fc5fd1d6960..5917a72c83b 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -209,7 +209,7 @@
 
 	if(prob(60))
 		//phoron bounties
-		var/datum/bounty/item/phoron_bounty = pick(/datum/bounty/item/phoron_sheet, /datum/bounty/item/solar_array)
+		var/datum/bounty/item/phoron_bounty = pick(/datum/bounty/item/phoron_sheet, /datum/bounty/item/engineer/solar)
 		try_add_bounty(new phoron_bounty)
 	else
 		var/datum/bounty/B = pick(bounties_list)
diff --git a/html/changelogs/Bat-SolarPanelBounty.yml b/html/changelogs/Bat-SolarPanelBounty.yml
new file mode 100644
index 00000000000..d354536f0bc
--- /dev/null
+++ b/html/changelogs/Bat-SolarPanelBounty.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Batrachophrenoboocosmomachia
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscdel: "Removes 'Assembled Solar Panels' bounty from bounty pool and updates the 'Solar Assemblies or Trackers' with its old description referencing the phoron scarcity."