manual merge

2017-04-29 11:42:28 -05:00
parent bde5d6253a
commit 991fb8335c
25 changed files with 301 additions and 320 deletions
@@ -3,7 +3,7 @@
 	var/deletes_extract = TRUE

 /datum/chemical_reaction/slime/on_reaction(datum/reagents/holder)
-	feedback_add_details("slime_cores_used","[type]")
+	SSblackbox.add_details("slime_cores_used","[type]")
 	if(deletes_extract)
 		delete_extract(holder)