diff --git a/Resources/Locale/en-US/reagents/ethyloxyephedrine.ftl b/Resources/Locale/en-US/reagents/ethyloxyephedrine.ftl
new file mode 100644
index 0000000000..0f135f3aaf
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/ethyloxyephedrine.ftl
@@ -0,0 +1,4 @@
+### Messages that pop up when metabolizing ethyloxyephedrine
+
+ethyloxyephedrine-effect-feeling-awake = You feel more awake.
+ethyloxyephedrine-effect-clear-mind = The fog of sleep before you clears away.
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index c40f105cf0..6d8d261592 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -89,4 +89,10 @@ reagent-name-ethylredoxrazine = ethylredoxrazine
 reagent-desc-ethylredoxrazine = Neutralises the effects of alcohol in the blood stream. Though it is commonly needed, it is rarely requested.
 
 reagent-name-cognizine = cognizine
-reagent-desc-cognizine = A mysterious chemical which is able to make any non-sentient creature sentient.
\ No newline at end of file
+reagent-desc-cognizine = A mysterious chemical which is able to make any non-sentient creature sentient.
+
+reagent-name-ethyloxyephedrine = ethyloxyephedrine
+reagent-desc-ethyloxyephedrine = An unstable medicine derived from desoxyephedrine. With the main effects of desoxyephedrine neutralized, it may be useful for something else.
+
+reagent-name-diphenylmethylamine = diphenylmethylamine
+reagent-desc-diphenylmethylamine = A more stable medicine than ethyloxyephedrine. Useful for keeping someone awake.
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 91dfe32f3e..9697df1e6f 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -711,3 +711,49 @@
         conditions:
         - !type:ReagentThreshold
           min: 5
+
+- type: reagent
+  id: Ethyloxyephedrine
+  name: reagent-name-ethyloxyephedrine
+  desc: reagent-desc-ethyloxyephedrine
+  group: Medicine
+  physicalDesc: reagent-physical-desc-shiny
+  flavor: medicine
+  color: "#d5d5e4"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:Jitter
+      - !type:GenericStatusEffect
+        key: Stutter
+        component: StutteringAccent
+      - !type:ResetNarcolepsy
+        conditions:
+        - !type:ReagentThreshold
+          min: 10
+      - !type:PopupMessage
+        visualType: Medium
+        messages: ["ethyloxyephedrine-effect-feeling-awake", "ethyloxyephedrine-effect-clear-mind"]
+        type: Local
+        probability: 0.1
+
+- type: reagent
+  id: Diphenylmethylamine
+  name: reagent-name-diphenylmethylamine
+  desc: reagent-desc-diphenylmethylamine
+  group: Medicine
+  physicalDesc: reagent-physical-desc-glowing
+  flavor: medicine
+  color: "#b0abaa"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:ResetNarcolepsy
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
+      - !type:PopupMessage
+        visualType: Medium
+        messages: ["ethyloxyephedrine-effect-feeling-awake", "ethyloxyephedrine-effect-clear-mind"]
+        type: Local
+        probability: 0.1
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index cc4266d0a2..90f9c77f59 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -45,7 +45,7 @@
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
-          min: 5
+          min: 20
 
 - type: reagent
   id: Ephedrine
@@ -90,7 +90,7 @@
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
-          min: 10
+          min: 30
 
 - type: reagent
   id: THC
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index caacb0ef55..e805a31b89 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -361,4 +361,30 @@
     Oxygen:
       amount: 1
   products:
-    NorepinephricAcid: 2
\ No newline at end of file
+    NorepinephricAcid: 2
+
+- type: reaction
+  id: Ethyloxyephedrine
+  impact: Medium
+  reactants:
+    Desoxyephedrine:
+      amount: 1
+    Stellibinin:
+      amount: 1
+  products:
+    Ethyloxyephedrine: 2
+
+- type: reaction
+  id: Diphenylmethylamine
+  impact: Medium
+  reactants:
+    Ethyloxyephedrine: 
+      amount: 1
+    Charcoal:
+      amount: 1
+    Pax:
+      amount: 1
+    Coffee: 
+      amount: 1
+  products:
+    Diphenylmethylamine: 2
\ No newline at end of file