From b320d4bba483943f83ae3f318120f86c734fbdad Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 5 May 2022 15:14:25 +0200 Subject: [PATCH] Fix granular admin ranks not being loaded from DB (#66706) (#13335) Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/modules/admin/admin_ranks.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 1f21960eaf9..ab9417f2d6d 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -268,13 +268,16 @@ GLOBAL_PROTECT(protected_ranks) var/admin_ckey = ckey(query_load_admins.item[1]) var/admin_rank = query_load_admins.item[2] var/skip - if(rank_names[admin_rank] == null) + + var/list/admin_ranks = ranks_from_rank_name(admin_rank) + + if(admin_ranks.len == 0) message_admins("[admin_ckey] loaded with invalid admin rank [admin_rank].") skip = 1 if(GLOB.admin_datums[admin_ckey] || GLOB.deadmins[admin_ckey]) skip = 1 if(!skip) - new /datum/admins(ranks_from_rank_name(admin_rank), admin_ckey) + new /datum/admins(admin_ranks, admin_ckey) qdel(query_load_admins) //load admins from backup file if(dbfail)