Merge branch 'master' into upstream-merge-27268

This commit is contained in:
Poojawa
2017-05-21 01:22:16 -05:00
committed by GitHub
+1 -2
View File
@@ -85,7 +85,7 @@ SUBSYSTEM_DEF(blackbox)
if (!SSdbcore.Connect())
return
var/list/sqlrowlist = list()
for (var/datum/feedback_variable/FV in feedback)
@@ -96,7 +96,6 @@ SUBSYSTEM_DEF(blackbox)
SSdbcore.MassInsert(format_table_name("feedback"), sqlrowlist, ignore_errors = TRUE, delayed = TRUE)
/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq)
switch(freq)
if(1459)