Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00
parent e66cbfd7db 55dd3876e5
commit 52fa1f314f
531 changed files with 5863 additions and 3439 deletions
@@ -21,7 +21,7 @@
 	attach(A2,user)
 	name = "[A.name]-[A2.name] assembly"
 	update_icon()
-	feedback_add_details("assembly_made","[initial(A.name)]-[initial(A2.name)]")
+	SSblackbox.add_details("assembly_made","[initial(A.name)]-[initial(A2.name)]")

 /obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user)
 	if(!A.remove_item_from_storage(src))