From 9623f92ed5605d9eaf31182d4b480f9501a8a46c Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Jul 2024 10:10:17 -0700
Subject: [PATCH] Mission Drills and Containers display what they need (#3211)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Outpost mission drills and containers from acquire missions show what
they need in the object's name.

![image](https://github.com/user-attachments/assets/fb10de74-f6f8-4c52-8757-eb85efa275cd)

![image](https://github.com/user-attachments/assets/b9c6ac35-b5f8-404b-b343-c5073a3f627d)

Also changes the name of the base fish type so it doesn't look odd when
displayed.

## Why It's Good For The Game
Quality of life change, and should help prevent bounty mission
objectives being mixed up. It's fairly awkward mixing up two creature
captures and having to shuffle them for example.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Acquire Mission containers and Mission drills display their
objective type.
add: Changed name of base fish type to generic fish
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/modules/fishing/fish/_fish.dm               | 2 +-
 code/modules/overmap/missions/acquire_mission.dm | 1 +
 code/modules/overmap/missions/drill_mission.dm   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index f474018739d0..4f2c3cd1343a 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -1,6 +1,6 @@
 // Fish path used for autogenerated fish
 /obj/item/fish
-	name = "generic looking aquarium fish"
+	name = "generic fish"
 	desc = "very bland"
 	icon = 'icons/obj/aquarium.dmi'
 	icon_state = "trout" //Replace this with "bugfish" from tg please
diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm
index 1c9b9974ed1b..8a3424c8eb11 100644
--- a/code/modules/overmap/missions/acquire_mission.dm
+++ b/code/modules/overmap/missions/acquire_mission.dm
@@ -14,6 +14,7 @@
 /datum/mission/acquire/accept(datum/overmap/ship/controlled/acceptor, turf/accept_loc)
 	. = ..()
 	container = spawn_bound(container_type, accept_loc, VARSET_CALLBACK(src, container, null))
+	container.name += " ([capitalize(objective_type.name)])"
 
 /datum/mission/acquire/Destroy()
 	container = null
diff --git a/code/modules/overmap/missions/drill_mission.dm b/code/modules/overmap/missions/drill_mission.dm
index 06859e8327d2..307d73d59592 100644
--- a/code/modules/overmap/missions/drill_mission.dm
+++ b/code/modules/overmap/missions/drill_mission.dm
@@ -21,7 +21,7 @@
 	sampler = spawn_bound(/obj/machinery/drill/mission, accept_loc, VARSET_CALLBACK(src, sampler, null))
 	sampler.mission_class = class_wanted
 	sampler.num_wanted = num_wanted
-
+	sampler.name += " (Class [class_wanted])"
 //Gives players a little extra money for going past the mission goal
 /datum/mission/drill/turn_in()
 	value += (sampler.num_current - num_wanted)*50