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
@@ -32,4 +32,4 @@

 	unbuckle_all_mobs(TRUE)

-	sql_report_death(src)
+	SSblackbox.ReportDeath(src)
@@ -222,7 +222,7 @@
 	if(R.hud_used)
 		R.hud_used.update_robot_modules_display()
 	if(feedback_key && !did_feedback)
-		feedback_inc(feedback_key, 1)
+		SSblackbox.inc(feedback_key, 1)

 /obj/item/weapon/robot_module/standard
 	name = "Standard"