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

Resolve merge conflicts with master.

Browse source
This commit is contained in:
Griatch 2017-08-19 21:30:42 +02:00
commit 7ff783fea1
21 changed files with 900 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/extended_room.py
View file

@ -428,7 +428,7 @@ class CmdExtendedDesc(default_cmds.CmdDesc):
if self.switches and self.switches[0] in ("spring", "summer", "autumn", "winter"):
# a seasonal switch was given
if self.rhs:
caller.msg("Seasonal descs only works with rooms, not objects.")
caller.msg("Seasonal descs only work with rooms, not objects.")
return
switch = self.switches[0]
if not location: