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

Merge branch 'master' of github.com:evennia/evennia

Browse source
This commit is contained in:
Griatch 2014-02-01 18:35:01 +01:00
commit 1352fecf75
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/default/general.py
View file

@ -283,7 +283,7 @@ class CmdDrop(MuxCommand):
# now we send it into the error handler (this will output consistent # now we send it into the error handler (this will output consistent
# error messages if there are problems). # error messages if there are problems).
obj = AT_SEARCH_RESULT(caller, self.args, results, False, obj = AT_SEARCH_RESULT(caller, self.args, results, False,
nofound_string="You don't carry %s." % self.args, nofound_string="You aren't carrying %s." % self.args,
multimatch_string="You carry more than one %s:" % self.args) multimatch_string="You carry more than one %s:" % self.args)
if not obj: if not obj:
return return

2
src/objects/objects.py
View file

@ -259,7 +259,7 @@ class Object(TypeClass):
location=location, location=location,
attribute_name=attribute_name, attribute_name=attribute_name,
quiet=quiet, quiet=quiet,
exact=quiet) exact=exact)
def execute_cmd(self, raw_string, sessid=None): def execute_cmd(self, raw_string, sessid=None):
""" """