Merge pull request #1 from nyuszika7h/master

Merged new commits
This commit is contained in:
xnrand 2013-11-10 10:50:26 -08:00
commit 2cf79ee022

View File

@ -1391,9 +1391,17 @@ def transition_day(cli, gameid=0):
"tragedy.").format(victim, var.get_role(victim))) "tragedy.").format(victim, var.get_role(victim)))
dead.append(victim) dead.append(victim)
var.LOGGER.logBare(victim, "KILLED") var.LOGGER.logBare(victim, "KILLED")
if random.random() < 0.01: wut = random.random()
if wut < 0.01:
# this is pointless. # this is pointless.
message.append("https://i.imgur.com/nO8rZ.gif") message.append("https://i.imgur.com/nO8rZ.gif")
elif wut < 0.02:
message.append("https://i.imgur.com/uGVfZ.jpg")
elif wut < 0.03:
message.append("https://i.imgur.com/mUcM09n.gif")
elif wut < 0.04:
message.append("https://i.imgur.com/P7TEGyQ.gif")
if victim in var.GUNNERS.keys() and var.GUNNERS[victim]: # victim had bullets! if victim in var.GUNNERS.keys() and var.GUNNERS[victim]: # victim had bullets!
if random.random() < var.GUNNER_KILLS_WOLF_AT_NIGHT_CHANCE: if random.random() < var.GUNNER_KILLS_WOLF_AT_NIGHT_CHANCE:
wc = var.ROLES["werecrow"][:] wc = var.ROLES["werecrow"][:]
@ -2683,7 +2691,7 @@ def show_admins(cli, nick, chan, rest):
if not var.ADMIN_PINGING: if not var.ADMIN_PINGING:
return return
if (is_admin(cloak) and 'G' not in status and if (is_admin(cloak) and 'G' not in status and
user != botconfig.NICK and cloak not in var.AWAY): user != botconfig.NICK):
admins.append(user) admins.append(user)
@hook("endofwho", hookid = 4) @hook("endofwho", hookid = 4)