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-12-05 17:14:25 +01:00
commit 13ebf768db
5 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -301,7 +301,7 @@ class CmdDelAccount(COMMAND_DEFAULT_CLASS):
# one single match
account = accounts.pop()
account = accounts.first()
if not account.access(caller, 'delete'):
string = "You don't have the permissions to delete that account."

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

@ -1087,7 +1087,7 @@ class CmdSetHome(CmdLink):
set an object's home location
Usage:
@home <obj> [= <home_location>]
@sethome <obj> [= <home_location>]
The "home" location is a "safety" location for objects; they
will be moved there if their current location ceases to exist. All
@ -1098,13 +1098,13 @@ class CmdSetHome(CmdLink):
"""
key = "@sethome"
locks = "cmd:perm(@home) or perm(Builder)"
locks = "cmd:perm(@sethome) or perm(Builder)"
help_category = "Building"
def func(self):
"""implement the command"""
if not self.args:
string = "Usage: @home <obj> [= <home_location>]"
string = "Usage: @sethome <obj> [= <home_location>]"
self.caller.msg(string)
return