Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
parent 4a6ffec412 a8e6de5795
commit 3b8484b52b
131 changed files with 2226 additions and 589 deletions
@@ -390,7 +390,7 @@
 		if(contents.len)
 			if(full_pressure)
 				spawn(0)
-					feedback_inc("disposal_auto_flush",1)
+					SSblackbox.inc("disposal_auto_flush",1)
 					flush()
 		flush_count = 0