Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2011-12-25 00:55:20 -05:00
39 changed files with 10258 additions and 9949 deletions
+2 -2
View File
@@ -481,9 +481,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
if(config.allow_admin_rev)
//M.fireloss = 0
M.toxloss = 0
M.setToxLoss(0)
//M.bruteloss = 0
M.oxyloss = 0
M.setOxyLoss(0)
M.paralysis = 0
M.stunned = 0
M.weakened = 0