Merge branch 'master' into upstream-merge-29105

2017-09-02 07:11:32 -05:00
parent 8731fb7e1c 2bfc7872fa
commit 3e0ead1204
1577 changed files with 55829 additions and 215217 deletions
@@ -282,4 +282,4 @@ SUBSYSTEM_DEF(blackbox)
 	return details

 /datum/feedback_variable/proc/get_parsed()
-	return list(variable,value,details)
+	return list(variable,value,details)