From 3f3eeb83bf2df95610beed792f2b767e2612a28e Mon Sep 17 00:00:00 2001 From: Jordie Date: Tue, 5 Sep 2017 17:12:34 +1000 Subject: [PATCH 1/5] 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 From a7ed551f1edde7d0a5479e99529a5cbf4bfd9578 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Tue, 5 Sep 2017 05:21:00 -0500 Subject: [PATCH 2/5] Update blackbox.dm --- code/controllers/subsystem/blackbox.dm | 31 +++++--------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index a9fa2af6e8..301ceeac21 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -18,16 +18,14 @@ SUBSYSTEM_DEF(blackbox) var/list/msg_other = list() var/list/feedback = list() //list of datum/feedback_variable - var/triggertime = 0 var/sealed = FALSE //time to stop tracking stats? - + /datum/controller/subsystem/blackbox/Initialize() triggertime = world.time . = ..() - //poll population /datum/controller/subsystem/blackbox/fire() if(!SSdbcore.Connect()) @@ -37,16 +35,14 @@ SUBSYSTEM_DEF(blackbox) if(M.client) playercount += 1 var/admincount = GLOB.admins.len - var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')") + var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port, round_id) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', '[GLOB.round_id]')") query_record_playercount.Execute() - - + if(config.use_exp_tracking) if((triggertime < 0) || (world.time > (triggertime +3000))) //subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check update_exp(10,FALSE) - /datum/controller/subsystem/blackbox/Recover() msg_common = SSblackbox.msg_common msg_science = SSblackbox.msg_science @@ -212,8 +208,10 @@ SUBSYSTEM_DEF(blackbox) var/x_coord = sanitizeSQL(L.x) var/y_coord = sanitizeSQL(L.y) var/z_coord = sanitizeSQL(L.z) + var/last_words = sanitizeSQL(L.last_words) + var/suicide = sanitizeSQL(L.suiciding) var/map = sanitizeSQL(SSmapping.config.map_name) - var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss) VALUES ('[sqlpod]', '[x_coord]', '[y_coord]', '[z_coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', [GLOB.round_id], '[SQLtime()]', '[sqljob]', '[sqlspecial]', '[sqlname]', '[sqlkey]', '[laname]', '[lakey]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina])") + var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, last_words, suicide) VALUES ('[sqlpod]', '[x_coord]', '[y_coord]', '[z_coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', [GLOB.round_id], '[SQLtime()]', '[sqljob]', '[sqlspecial]', '[sqlname]', '[sqlkey]', '[laname]', '[lakey]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[last_words]', [suicide])") query_report_death.Execute() /datum/controller/subsystem/blackbox/proc/Seal() @@ -267,18 +265,6 @@ SUBSYSTEM_DEF(blackbox) /datum/feedback_variable/proc/get_variable() return variable -<<<<<<< HEAD -/datum/feedback_variable/proc/set_details(text) - if (istext(text)) - details = text - -/datum/feedback_variable/proc/add_details(text) - if (istext(text)) - if (!details) - details = "\"[text]\"" - else - details += " | \"[text]\"" -======= /datum/feedback_variable/proc/set_details(deets) details = list("\"[deets]\"") @@ -287,14 +273,9 @@ SUBSYSTEM_DEF(blackbox) set_details(deets) else details += "\"[deets]\"" ->>>>>>> dfeb900... Merge pull request #30431 from MrStonedOne/patch-418 /datum/feedback_variable/proc/get_details() return details.Join(" | ") /datum/feedback_variable/proc/get_parsed() -<<<<<<< HEAD - return list(variable,value,details) -======= return list(variable,value,details.Join(" | ")) ->>>>>>> dfeb900... Merge pull request #30431 from MrStonedOne/patch-418 From ee41b3da6fbdc7ad248a949bf4729cb627305fa6 Mon Sep 17 00:00:00 2001 From: Anonmare Date: Thu, 7 Sep 2017 02:35:50 +0100 Subject: [PATCH 3/5] Alters the pressure plate crafting recipe (#30452) --- code/modules/crafting/recipes.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 6271d2caf5..1f12e671ec 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -555,7 +555,10 @@ name = "Pressure Plate" result = /obj/item/device/pressure_plate time = 5 - reqs = list(/obj/item/stack/sheet/plasteel = 1, /obj/item/stack/tile/plasteel = 1, /obj/item/stack/cable_coil = 2) + reqs = list(/obj/item/stack/sheet/metal = 1, + /obj/item/stack/tile/plasteel = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/device/assembly/igniter = 1) category = CAT_MISC From 3379cb9427f0db2dd32b85bec40afa226e856510 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 7 Sep 2017 06:26:53 -0500 Subject: [PATCH 5/5] Automatic changelog generation for PR #2632 [ci skip] --- html/changelogs/AutoChangeLog-pr-2632.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2632.yml diff --git a/html/changelogs/AutoChangeLog-pr-2632.yml b/html/changelogs/AutoChangeLog-pr-2632.yml new file mode 100644 index 0000000000..dcfc2d5450 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2632.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - balance: "Altered pressure plate crafting recipe"