Merge branch 'master' into development

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-7_roof.dmm

code/modules/admin/admin_ranks.dm

@@ -66,6 +66,10 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 		C.holder = null
 	admins.Cut()
 
+	// Clears admins from the world config.
+	for (var/A in world.GetConfig("admin"))
+		world.SetConfig("APP/admin", A, null)
+
 	if(config.admin_legacy_system)
 		load_admin_ranks()
 

code/modules/admin/admin_verbs.dm

@@ -431,6 +431,7 @@ var/list/admin_verbs_cciaa = list(
 		admin_verbs_spawn,
 		debug_verbs
 		)
+	add_aooc_if_necessary()
 
 /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs
 	set name = "Adminverbs - Hide Most"

code/modules/admin/holder2.dm

@@ -33,6 +33,9 @@ var/list/admin_datums = list()
 	rights = initial_rights
 	admin_datums[ckey] = src
 
+	if (rights & R_DEBUG)
+		world.SetConfig("APP/admin", ckey, "role=admin")
+
 /datum/admins/proc/associate(client/C)
 	if(istype(C))
 		owner = C