From cb62dc99ce13b0c9d9ab192c99400dfb9f7d3d55 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 6 Jan 2018 14:32:01 +0100 Subject: [PATCH] Fixes some antags missing from roundend report (#34114) --- code/datums/antagonists/datum_traitor.dm | 10 +++++----- code/datums/antagonists/nukeop.dm | 12 ++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm index 80487f69e82..420dae46503 100644 --- a/code/datums/antagonists/datum_traitor.dm +++ b/code/datums/antagonists/datum_traitor.dm @@ -301,11 +301,11 @@ var/TC_uses = 0 var/uplink_true = FALSE var/purchases = "" - for(var/datum/component/uplink/H in GLOB.uplinks) - if(H.owner && H.owner == owner.key) - TC_uses += H.purchase_log.total_spent - uplink_true = TRUE - purchases += H.purchase_log.generate_render(FALSE) + var/datum/uplink_purchase_log/H = GLOB.uplink_purchase_logs_by_key[owner.key] + if(H) + TC_uses = H.total_spent + uplink_true = TRUE + purchases += H.generate_render(FALSE) var/objectives_text = "" if(objectives.len)//If the traitor had no objectives, don't need to process this. diff --git a/code/datums/antagonists/nukeop.dm b/code/datums/antagonists/nukeop.dm index 441098aabd7..99d273ac977 100644 --- a/code/datums/antagonists/nukeop.dm +++ b/code/datums/antagonists/nukeop.dm @@ -303,14 +303,10 @@ var/TC_uses = 0 for(var/I in members) var/datum/mind/syndicate = I - for(var/U in GLOB.uplinks) - var/datum/component/uplink/H = U - if(H.owner == syndicate.key) - TC_uses += H.purchase_log.total_spent - if(H.purchase_log) - purchases += H.purchase_log.generate_render(show_key = FALSE) - else - stack_trace("WARNING: Nuke Op uplink with no purchase_log Owner: [H.owner]") + var/datum/uplink_purchase_log/H = GLOB.uplink_purchase_logs_by_key[syndicate.key] + if(H) + TC_uses += H.total_spent + purchases += H.generate_render(show_key = FALSE) text += printplayerlist(members) text += "
" text += "(Syndicates used [TC_uses] TC) [purchases]"