Merge pull request #8203 from Baystation12/master

Master into dev.
This commit is contained in:
Zuhayr
2015-02-22 18:24:47 +10:30
2 changed files with 21 additions and 21 deletions
+20 -20
View File
@@ -3180,17 +3180,17 @@ datum
if(!data) data = 1
data++
M.dizziness +=6
if(data >= 15 && data <45)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
else if(data >= 45 && prob(50) && data <55)
M.confused = max(M.confused+3,0)
else if(data >=55)
M.druggy = max(M.druggy, 55)
else if(data >=200)
M.adjustToxLoss(2)
switch(data)
if(15 to 45)
M.stuttering = max(M.stuttering+3,0)
if(45 to 55)
if (prob(50))
M.confused = max(M.confused+3,0)
if(55 to 200)
M.druggy = max(M.druggy, 55)
if(200 to INFINITY)
M.adjustToxLoss(2)
..()
return
neurotoxin
name = "Neurotoxin"
@@ -3210,17 +3210,17 @@ datum
if(!data) data = 1
data++
M.dizziness +=6
if(data >= 15 && data <45)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
else if(data >= 45 && prob(50) && data <55)
M.confused = max(M.confused+3,0)
else if(data >=55)
M.druggy = max(M.druggy, 55)
else if(data >=200)
M.adjustToxLoss(2)
switch(data)
if(15 to 45)
M.stuttering = max(M.stuttering+3,0)
if(45 to 55)
if (prob(50))
M.confused = max(M.confused+3,0)
if(55 to 200)
M.druggy = max(M.druggy, 55)
if(200 to INFINITY)
M.adjustToxLoss(2)
..()
return
hippies_delight
name = "Hippies' Delight"