From 3e9e4e7d82cb91f0d8e344ffeb1d5d97c1440568 Mon Sep 17 00:00:00 2001
From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Date: Thu, 5 Oct 2023 20:52:10 -0400
Subject: [PATCH] Removes more cases of the round end report telling on
 people's ckeys (#24094)

* Removes more cases of the round end report telling on people's ckeys

* Update modular_skyrat/modules/contractor/code/datums/contractor_datum.dm

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Update modular_skyrat/modules/contractor/code/datums/contractor_datum.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
---
 code/__HELPERS/roundend.dm                                  | 2 +-
 .../modules/contractor/code/datums/contractor_datum.dm      | 3 ++-
 modular_skyrat/modules/opposing_force/code/roundend.dm      | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 7c8fb23f4c3..bad17bdc28f 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -827,7 +827,7 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 		parts += "<span class='infoplain'>Total Achievements Earned: <B>[length(GLOB.achievements_unlocked)]!</B></span><BR>"
 		parts += "<ul class='playerlist'>"
 		for(var/datum/achievement_report/cheevo_report in GLOB.achievements_unlocked)
-			parts += "<BR>[cheevo_report.winner_key] was <b>[cheevo_report.winner]</b>, who earned the [span_greentext("'[cheevo_report.cheevo]'")] achievement at [cheevo_report.award_location]!<BR>"
+			parts += "<b>[cheevo_report.winner]</b> earned the [span_greentext("'[cheevo_report.cheevo]'")] achievement at [cheevo_report.award_location]!<BR>" // SKYRAT EDIT - No ckeys in the round end report - ORIGINAL: parts += "<BR>[cheevo_report.winner_key] was <b>[cheevo_report.winner]</b>, who earned the [span_greentext("'[cheevo_report.cheevo]'")] achievement at [cheevo_report.award_location]!<BR>"
 		parts += "</ul>"
 		return "<div class='panel greenborder'><ul>[parts.Join()]</ul></div>"
 
diff --git a/modular_skyrat/modules/contractor/code/datums/contractor_datum.dm b/modular_skyrat/modules/contractor/code/datums/contractor_datum.dm
index f7d4e09f41e..5346d412702 100644
--- a/modular_skyrat/modules/contractor/code/datums/contractor_datum.dm
+++ b/modular_skyrat/modules/contractor/code/datums/contractor_datum.dm
@@ -18,7 +18,8 @@
 		// Special case for reinforcements, we want to show their ckey and name on round end.
 		if (istype(contractor_purchase, /datum/contractor_item/contractor_partner))
 			var/datum/contractor_item/contractor_partner/partner = contractor_purchase
-			contractor_support_unit += "<br><b>[partner.partner_mind.key]</b> played <b>[partner.partner_mind.current.name]</b>, their contractor support unit."
+			var/mob/living/carbon/human/partner_mob = partner.partner_mind.current
+			contractor_support_unit += "<br><b>[partner_mob.name]</b> was [partner_mob.p_their()] contractor support unit."
 
 	if (length(contractor_hub.purchased_items))
 		result += "<br>(used [total_spent_rep] Rep) "
diff --git a/modular_skyrat/modules/opposing_force/code/roundend.dm b/modular_skyrat/modules/opposing_force/code/roundend.dm
index 07b81ff4e8a..1725eeaf363 100644
--- a/modular_skyrat/modules/opposing_force/code/roundend.dm
+++ b/modular_skyrat/modules/opposing_force/code/roundend.dm
@@ -1,7 +1,7 @@
 /datum/controller/subsystem/ticker/proc/opfor_report()
 	var/list/result = list()
 
-	result += "<div class='panel stationborder'><span class='header'>Opposing Force Report:</span><br>"
+	result += "<span class='header'>Opposing Force Report:</span><br>"
 
 	if(!SSopposing_force.approved_applications.len)
 		result += span_red("No applications were approved.")
@@ -9,6 +9,4 @@
 		for(var/datum/opposing_force/opfor in SSopposing_force.approved_applications)
 			result += opfor.roundend_report()
 
-	result += "</div>"
-
-	return result.Join()
+	return "<div class='panel stationborder'>[result.Join()]</div>"