From 3f3eeb83bf2df95610beed792f2b767e2612a28e Mon Sep 17 00:00:00 2001 From: Jordie Date: Tue, 5 Sep 2017 17:12:34 +1000 Subject: [PATCH] Make add_details faster and fix the lag. (maybe) --- code/controllers/subsystem/blackbox.dm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index b85e99a0b9..a9fa2af6e8 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -229,7 +229,7 @@ SUBSYSTEM_DEF(blackbox) /datum/feedback_variable var/variable var/value - var/details + var/list/details /datum/feedback_variable/New(param_variable, param_value = 0) variable = param_variable @@ -267,6 +267,7 @@ SUBSYSTEM_DEF(blackbox) /datum/feedback_variable/proc/get_variable() return variable +<<<<<<< HEAD /datum/feedback_variable/proc/set_details(text) if (istext(text)) details = text @@ -277,9 +278,23 @@ SUBSYSTEM_DEF(blackbox) details = "\"[text]\"" else details += " | \"[text]\"" +======= +/datum/feedback_variable/proc/set_details(deets) + details = list("\"[deets]\"") + +/datum/feedback_variable/proc/add_details(deets) + if (!details) + set_details(deets) + else + details += "\"[deets]\"" +>>>>>>> dfeb900... Merge pull request #30431 from MrStonedOne/patch-418 /datum/feedback_variable/proc/get_details() - return details + return details.Join(" | ") /datum/feedback_variable/proc/get_parsed() - return list(variable,value,details) \ No newline at end of file +<<<<<<< HEAD + return list(variable,value,details) +======= + return list(variable,value,details.Join(" | ")) +>>>>>>> dfeb900... Merge pull request #30431 from MrStonedOne/patch-418