From 2444fac7b557d9b94e9511a956439fcb856ae28a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 3 Jan 2019 16:14:24 -0800
Subject: [PATCH 1/4] Update medicine_reagents.dm

---
 .../chemistry/reagents/medicine_reagents.dm         | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 671e62a9e6..0f1bed8968 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -546,19 +546,14 @@
 	overdose_threshold = 45
 	addiction_threshold = 30
 
-/datum/reagent/medicine/ephedrine/on_mob_add(mob/living/L)
-	..()
-	L.add_trait(TRAIT_GOTTAGOFAST, id)
-
-/datum/reagent/medicine/ephedrine/on_mob_delete(mob/living/L)
-	L.remove_trait(TRAIT_GOTTAGOFAST, id)
-	..()
-
 /datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/M)
 	M.AdjustStun(-20, 0)
 	M.AdjustKnockdown(-20, 0)
 	M.AdjustUnconscious(-20, 0)
-	M.adjustStaminaLoss(-1*REM, 0)
+	M.adjustStaminaLoss(-4.5*REM, 0)
+	M.jitter = max(M.jitter + 2, 15)
+	if(prob(5))
+		M.Confuse(3)
 	..()
 	return TRUE
 

From dc5f4ea67bf0350c00ccef27462201777ad6ffc2 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 3 Jan 2019 16:15:34 -0800
Subject: [PATCH 2/4] Update medicine_reagents.dm

---
 code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 0f1bed8968..b4fa3676f7 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -552,8 +552,8 @@
 	M.AdjustUnconscious(-20, 0)
 	M.adjustStaminaLoss(-4.5*REM, 0)
 	M.jitter = max(M.jitter + 2, 15)
-	if(prob(5))
-		M.Confuse(3)
+	if(prob(50))
+		M.Confuse(1)
 	..()
 	return TRUE
 

From 5abdf53e35a2dac9505237c3df849e8391cc5994 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 3 Jan 2019 16:31:24 -0800
Subject: [PATCH 3/4] Update medicine_reagents.dm

---
 code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index b4fa3676f7..02c5d61643 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -551,7 +551,7 @@
 	M.AdjustKnockdown(-20, 0)
 	M.AdjustUnconscious(-20, 0)
 	M.adjustStaminaLoss(-4.5*REM, 0)
-	M.jitter = max(M.jitter + 2, 15)
+	M.Jitter(10)
 	if(prob(50))
 		M.Confuse(1)
 	..()

From 246d6b391f132cb4bf29718dd9fdcd5e3644eaff Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 4 Jan 2019 00:47:02 -0800
Subject: [PATCH 4/4] Update medicine_reagents.dm

---
 code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 02c5d61643..4e278d2ede 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -553,7 +553,7 @@
 	M.adjustStaminaLoss(-4.5*REM, 0)
 	M.Jitter(10)
 	if(prob(50))
-		M.Confuse(1)
+		M.confused = max(M.confused, 1)
 	..()
 	return TRUE