Merge pull request #2271 from comma/master

Fixes Take Three
This commit is contained in:
Hawk-v3
2013-02-06 15:47:14 -08:00
7 changed files with 50 additions and 46 deletions
+3 -3
View File
@@ -1651,7 +1651,7 @@ datum
description = "A highly addictive stimulant extracted from the tobacco plant."
reagent_state = LIQUID
color = "#181818" // rgb: 24, 24, 24
/*
ethanol
name = "Ethanol"
id = "ethanol"
@@ -1685,7 +1685,7 @@ datum
else
usr << "It wasn't enough..."
return
*/
ammonia
name = "Ammonia"
id = "ammonia"
@@ -2593,7 +2593,7 @@ datum
if(A.data) d += A.data
M.dizziness +=dizzy_adj.
if(d >= slur_start && d < confused_start)
if(d >= slur_start && d < pass_out)
if (!M:slurring) M:slurring = 1
M:slurring += slurr_adj
if(d >= confused_start && prob(33))