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

@@ -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

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

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)