mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
Fixed double definition of ethanol.
Fixed issue with emotes being slurred up.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user