mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
# Conflicts: # code/modules/economy/lorenews.dm # code/modules/mob/living/simple_animal/animals/cat.dm # html/changelogs/.all_changelog.yml # maps/southern_cross/southern_cross-1.dmm
This commit is contained in:
@@ -6,6 +6,10 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
|
||||
|
||||
var/previous_rights = 0
|
||||
|
||||
//Clear profile access
|
||||
for(var/A in world.GetConfig("admin"))
|
||||
world.SetConfig("APP/admin", A, null)
|
||||
|
||||
//load text from file
|
||||
var/list/Lines = file2list("config/admin_ranks.txt")
|
||||
|
||||
|
||||
@@ -23,6 +23,8 @@ var/list/admin_datums = list()
|
||||
rank = initial_rank
|
||||
rights = initial_rights
|
||||
admin_datums[ckey] = src
|
||||
if(rights & R_DEBUG) //grant profile access
|
||||
world.SetConfig("APP/admin", ckey, "role=admin")
|
||||
|
||||
/datum/admins/proc/associate(client/C)
|
||||
if(istype(C))
|
||||
|
||||
Reference in New Issue
Block a user