Merge branch 'pr/4'

Conflicts:
	.gitignore
This commit is contained in:
ZomgPonies
2013-08-24 17:25:58 -04:00
25 changed files with 332 additions and 189 deletions
+1 -1
View File
@@ -48,7 +48,7 @@ proc/admin_proc()
world << "you have enough rights!"
NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call
you will have to do something like if(client.rights & R_ADMIN) yourself.
you will have to do something like if(client.holder.rights & R_ADMIN) yourself.
*/
/proc/check_rights(rights_required, show_msg=1)
if(usr && usr.client)