From 8396c9fb3f8705c08def6b0b9947a716cdb97233 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 6 Feb 2013 21:38:21 +0400 Subject: [PATCH] Fixed double definition of ethanol. Fixed issue with emotes being slurred up. --- code/modules/mob/living/carbon/human/say.dm | 3 ++- code/modules/reagents/Chemistry-Reagents.dm | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index c518b27a02d..70786c605eb 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -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) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 6c2fe77508e..7dd051367d1 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -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))