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
@@ -583,9 +583,9 @@
 							"<span class='userdanger'>You feel an immense \
 							crushing pressure as the space around you ripples.</span>")
 					if(M.key || M.get_ghost(TRUE))
-						feedback_add_details("shuttle_gib", "[type]")
+						SSblackbox.add_details("shuttle_gib", "[type]")
 					else
-						feedback_add_details("shuttle_gib_unintelligent", "[type]")
+						SSblackbox.add_details("shuttle_gib_unintelligent", "[type]")
 					M.gib()

 			else //non-living mobs shouldn't be affected by shuttles, which is why this is an else