Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2017-10-03 09:36:42 +02:00
commit 313a907a3a
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/commands/default/admin.py
View file

@ -525,13 +525,13 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
return
if perm in permissions:
caller_result.append("\nPermission '%s' is already defined on %s." % (rhs, obj.name))
caller_result.append("\nPermission '%s' is already defined on %s." % (perm, obj.name))
else:
obj.permissions.add(perm)
plystring = "the Account" if accountmode else "the Object/Character"
caller_result.append("\nPermission '%s' given to %s (%s)." % (rhs, obj.name, plystring))
caller_result.append("\nPermission '%s' given to %s (%s)." % (perm, obj.name, plystring))
target_result.append("\n%s gives you (%s, %s) the permission '%s'."
% (caller.name, obj.name, plystring, rhs))
% (caller.name, obj.name, plystring, perm))
caller.msg("".join(caller_result).strip())
if target_result:
obj.msg("".join(target_result).strip())