Merge branch 'master' into upstream-merge-37623

2018-05-22 07:23:41 -05:00
parent 75144686a4 b3e5513185
commit 664f2ac150
654 changed files with 11941 additions and 9279 deletions
@@ -242,7 +242,6 @@ GLOBAL_PROTECT(protected_ranks)
 				var/skip
 				if(rank_names[admin_rank] == null)
 					message_admins("[admin_ckey] loaded with invalid admin rank [admin_rank].")
-					log_sql("[admin_ckey] loaded with invalid admin rank [admin_rank].")
 					skip = 1
 				if(GLOB.admin_datums[admin_ckey] || GLOB.deadmins[admin_ckey])
 					skip = 1