Merge pull request #7551 from Kyep/ga_smitebless

Changes Smite/Bless to require R_EVENT permissions
This commit is contained in:
Fox McCloud
2017-06-23 01:08:52 -04:00
committed by GitHub
2 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -101,10 +101,10 @@ var/global/nologevent = 0
<br><br>
[check_rights(R_ADMIN,0) ? "<A href='?_src_=holder;traitor=\ref[M]'>Traitor panel</A> | " : "" ]
<A href='?_src_=holder;narrateto=\ref[M]'>Narrate to</A> |
<A href='?_src_=holder;subtlemessage=\ref[M]'>Subtle message</A> |
<A href='?_src_=holder;Bless=[M.UID()]'>Bless</A> |
<A href='?_src_=holder;Smite=[M.UID()]'>Smite</A>
<A href='?_src_=holder;subtlemessage=\ref[M]'>Subtle message</A>
"}
if(check_rights(R_EVENT))
body += {" | <A href='?_src_=holder;Bless=[M.UID()]'>Bless</A> | <A href='?_src_=holder;Smite=[M.UID()]'>Smite</A>"}
if(M.client)
if(!istype(M, /mob/new_player))
+2 -2
View File
@@ -1728,7 +1728,7 @@
log_admin("[key_name(src.owner)] sent [key_name(H)] a [eviltype] fax")
message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a [eviltype] fax")
else if(href_list["Bless"])
if(!check_rights(R_ADMIN))
if(!check_rights(R_EVENT))
return
var/mob/living/M = locateUID(href_list["Bless"])
if(!istype(M))
@@ -1778,7 +1778,7 @@
log_admin("[key_name(owner)] answered [key_name(M)]'s prayer with a blessing: [logmsg]")
message_admins("[key_name_admin(owner)] answered [key_name_admin(M)]'s prayer with a blessing: [logmsg]")
else if(href_list["Smite"])
if(!check_rights(R_ADMIN))
if(!check_rights(R_EVENT))
return
var/mob/living/M = locateUID(href_list["Smite"])
var/mob/living/carbon/human/H