Merge branch 'CI2' of https://github.com/vode-code/CEV-Eris into CI2

Author: vode-code

code/modules/admin/verbs/reestablish_db_connection.dm

@@ -17,12 +17,8 @@
 		SSdbcore.Disconnect()
 		log_admin("[key_name(usr)] has forced the database to disconnect")
 		message_admins("[key_name_admin(usr)] has <b>forced</b> the database to disconnect!")
-		// SSblackbox.record_feedback("tally", "admin_verb", 1, "Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
 	log_admin("[key_name(usr)] is attempting to re-establish the DB Connection")
 	message_admins("[key_name_admin(usr)] is attempting to re-establish the DB Connection")
-	// SSblackbox.record_feedback("tally", "admin_verb", 1, "Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
 	SSdbcore.failed_connections = 0
 	if(!SSdbcore.Connect())
 		message_admins("Database connection failed: " + SSdbcore.ErrorMsg())