cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

check_rights/R_MOD update

Browse Source
This commit is contained in:
Markolie
2015-09-24 04:35:04 +02:00
parent fccac25c99
commit 1a2459de0a
15 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -2
View File
@@ -213,7 +213,7 @@ var/global/nologevent = 0
set category = "Admin"
set name = "Player Notes"
if(!check_rights(R_MOD|R_ADMIN))
if(!check_rights(R_ADMIN|R_MOD))
return
show_note()
@@ -222,7 +222,7 @@ var/global/nologevent = 0
set category = "Admin"
set name = "Show Player Notes"
if(!check_rights(R_MOD|R_ADMIN))
if(!check_rights(R_ADMIN|R_MOD))
return
show_note(key)
code/modules/admin/sql_notes.dm
+4 -4
View File
@@ -1,5 +1,5 @@
/proc/add_note(target_ckey, notetext, timestamp, adminckey, logged = 1, server, checkrights = 1)
if(checkrights && !check_rights(R_MOD))
if(checkrights && !check_rights(R_ADMIN|R_MOD))
return
if(!dbcon.IsConnected())
usr << "<span class='danger'>Failed to establish database connection.</span>"
@@ -47,7 +47,7 @@
show_note(target_ckey)
/proc/remove_note(note_id)
if(!check_rights(R_MOD))
if(!check_rights(R_ADMIN|R_MOD))
return
var/ckey
var/notetext
@@ -77,7 +77,7 @@
show_note(ckey)
/proc/edit_note(note_id)
if(!check_rights(R_MOD))
if(!check_rights(R_ADMIN|R_MOD))
return
if(!dbcon.IsConnected())
usr << "<span class='danger'>Failed to establish database connection.</span>"
@@ -112,7 +112,7 @@
show_note(target_ckey)
/proc/show_note(target_ckey, index, linkless = 0)
if(!check_rights(R_MOD))
if(!check_rights(R_ADMIN|R_MOD))
return
var/output
var/navbar
code/modules/admin/topic.dm
+6 -4
View File
@@ -11,7 +11,7 @@
return
if(href_list["rejectadminhelp"])
if(!check_rights(R_MOD))
if(!check_rights(R_ADMIN|R_MOD))
return
var/client/C = locate(href_list["rejectadminhelp"])
if(!C)
@@ -1122,7 +1122,7 @@
usr << browse(edit_log,"window=watchedits")
else if(href_list["mute"])
if(!check_rights(R_MOD))
if(!check_rights(R_ADMIN|R_MOD))
return
var/mob/M = locate(href_list["mute"])
@@ -1533,7 +1533,8 @@
show_player_panel(M)
else if(href_list["adminplayerobservejump"])
if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN)) return
if(!check_rights(R_ADMIN|R_MOD))
return
var/mob/M = locate(href_list["adminplayerobservejump"])
@@ -1543,7 +1544,8 @@
C.jumptomob(M)
else if(href_list["adminplayerobservefollow"])
if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN)) return
if(!check_rights(R_ADMIN|R_MOD))
return
var/mob/M = locate(href_list["adminplayerobservefollow"])
code/modules/admin/verbs/adminhelp.dm
+3 -3
View File
@@ -95,15 +95,15 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
var/list/banholders = list()
var/list/adminholders = list()
for(var/client/X in admins)
if((R_MOD | R_MENTOR) & X.holder.rights)
if(check_rights(R_MOD|R_MENTOR, 0, X.mob))
if(X.is_afk())
admin_number_afk++
modholders += X
if(R_ADMIN & X.holder.rights)
if(check_rights(R_ADMIN, 0, X.mob))
if(X.is_afk())
admin_number_afk++
adminholders += X
if(R_BAN & X.holder.rights)
if(check_rights(R_BAN, 0, X.mob))
banholders += X
switch(selected_type)
code/modules/admin/verbs/adminpm.dm
+9 -10
View File
@@ -117,7 +117,7 @@
//mod PMs are maroon
//PMs sent from admins and mods display their rank
if(holder)
if( holder.rights & (R_MOD | R_MENTOR) && !holder.rights & R_ADMIN )
if(check_rights(R_MOD|R_MENTOR,0) && !check_rights(R_ADMIN,0))
recieve_color = "maroon"
else
recieve_color = "red"
@@ -220,11 +220,11 @@
var/list/banholders = list()
var/list/adminholders = list()
for(var/client/X in admins)
if((R_MOD | R_MENTOR) & X.holder.rights)
if(check_rights(R_MOD|R_MENTOR, 0, X.mob))
modholders += X
if(R_ADMIN & X.holder.rights)
if(check_rights(R_ADMIN, 0, X.mob))
adminholders += X
if(R_BAN & X.holder.rights)
if(check_rights(R_BAN, 0, X.mob))
banholders += X
//we don't use message_admins here because the sender/receiver might get it too
@@ -235,15 +235,15 @@
if(X.key!=key && X.key!=C.key)
switch(type)
if("Question")
if(X.holder.rights & (R_MOD | R_MENTOR))
if(check_rights(R_MOD|R_MENTOR, 0, X.mob))
X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //inform X
else if(!modholders.len && X.holder.rights & R_ADMIN)
else if(!modholders.len && check_rights(R_ADMIN, 0, X.mob))
X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //Any admins in backup of mod question
if("Player Complaint")
if(X.holder.rights & R_BAN)
if(check_rights(R_BAN, 0, X.mob))
X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //There should always be at least 1 person with +BAN on
else
if((X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD) )
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //If there's no type, send to all admins.
/client/proc/cmd_admin_irc_pm()
@@ -271,6 +271,5 @@
for(var/client/X in admins)
if(X == src)
continue
if((X.holder.rights & R_ADMIN) || (X.holder.rights & (R_MOD | R_MENTOR)))
if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob))
X << "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;IRC-Admins:</B> \blue [msg]</font>"
code/modules/admin/verbs/adminsay.dm
+3 -2
View File
@@ -21,7 +21,8 @@
set name = "Msay"
set hidden = 1
if(!check_rights(R_ADMIN|R_MOD)) return
if(!check_rights(R_ADMIN|R_MOD))
return
msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
log_admin("MOD: [key_name(src)] : [msg]")
@@ -33,7 +34,7 @@
if(check_rights(R_ADMIN, 0))
spanclass = "mod_channel_admin"
for(var/client/C in admins)
if(R_MOD & C.holder.rights)
if(check_rights(R_ADMIN|R_MOD, 0, C.mob))
C << "<span class='[spanclass]'>MOD: <span class='name'>[key_name(usr, 1)]</span> ([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>"
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/randomverbs.dm
+1 -1
View File
@@ -152,7 +152,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
else
if(!usr || !usr.client)
return
if(!(usr.client.holder && usr.client.holder.rights && (usr.client.holder.rights & R_MOD)))
if(!check_rights(R_ADMIN|R_MOD))
usr << "<font color='red'>Error: cmd_admin_mute: You don't have permission to do this.</font>"
return
if(!M.client)