shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update holder2.dm

Browse Source
This commit is contained in:
deathride58
2017-12-14 14:33:17 -05:00
committed by GitHub
parent 55247e9bdf
commit 4d61ea105d
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/holder2.dm
-8
View File
@@ -149,13 +149,6 @@ you will have to do something like if(client.rights & R_ADMIN) yourself.
//This proc checks whether subject has at least ONE of the rights specified in rights_required.
/proc/check_rights_for(client/subject, rights_required)
<<<<<<< HEAD
if(subject && subject.holder && subject.holder.rank)
if(rights_required && !(rights_required & subject.holder.rank.rights))
return 0
return 1
return 0
=======
if(subject && subject.holder)
return subject.holder.check_for_rights(rights_required)
return 0
@@ -181,4 +174,3 @@ you will have to do something like if(client.rights & R_ADMIN) yourself.
/proc/HrefTokenFormField(forceGlobal = FALSE)
return "<input type='hidden' name='admin_token' value='[RawHrefToken(forceGlobal)]'>"
>>>>>>> 4e929c7... Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. (#33480)