Merge from master

This commit is contained in:
Griatch 2019-02-12 11:47:38 +01:00
commit d94566ef20
6 changed files with 6 additions and 6 deletions

View file

@ -3067,7 +3067,7 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
return
elif nprots > 1:
caller.msg("Found {} prototypes matching '{}':\n {}".format(
nprots, prototype, ", ".join(prot.get('prototype_key', '')
nprots, prototype, ", ".join(proto.get('prototype_key', '')
for proto in prototypes)))
return
# we have a prototype, check access