Merge remote-tracking branch 'upstream/master' into smoothballs

This commit is contained in:
xxalpha
2015-07-10 19:19:43 +01:00
72 changed files with 236 additions and 131 deletions
+1 -1
View File
@@ -33,7 +33,7 @@
notify_ghosts("Someone has begun playing with a [src.name] in [get_area(src)]!")
planchette = input("Choose the letter.", "Seance!") in list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
add_logs(M, src, "picked a letter on", addition="which was \"[planchette]\".")
add_logs(M, src, "picked a letter on", " which was \"[planchette]\".")
cooldown = world.time
lastuser = M.ckey