Fixed double definition of ethanol.

Fixed issue with emotes being slurred up.
This commit is contained in:
Chinsky
2013-02-06 21:38:21 +04:00
parent e02d79062f
commit 8396c9fb3f
2 changed files with 6 additions and 5 deletions
+2 -1
View File
@@ -101,7 +101,8 @@
message = "[uppertext(message)]!!" //because I don't know how to code properly in getting vars from other files -Bro
if (src.slurring)
message = slur(message)
if(copytext(message, 1, 2) != "*")
message = slur(message)
..(message)
/mob/living/carbon/human/say_understands(var/other)
+4 -4
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"
@@ -1740,7 +1740,7 @@ datum
if(2 to 50)
M.sleeping += 1
if(51 to INFINITY)
M.sleeping += 1
M.sleeping += 1
..()
return
@@ -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))