diff --git a/baystation12.dme b/baystation12.dme
index 37931890115..ed8bb4d58e3 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -5,83 +5,6 @@
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
-#define FILE_DIR "code"
-#define FILE_DIR "code/TriDimension"
-#define FILE_DIR "code/unused"
-#define FILE_DIR "code/unused/goonheist"
-#define FILE_DIR "code/WorkInProgress"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
-#define FILE_DIR "code/WorkInProgress/IndexLP"
-#define FILE_DIR "code/WorkInProgress/Susan"
-#define FILE_DIR "html"
-#define FILE_DIR "icons"
-#define FILE_DIR "icons/48x48"
-#define FILE_DIR "icons/ass"
-#define FILE_DIR "icons/effects"
-#define FILE_DIR "icons/mecha"
-#define FILE_DIR "icons/misc"
-#define FILE_DIR "icons/mob"
-#define FILE_DIR "icons/mob/human_races"
-#define FILE_DIR "icons/mob/in-hand"
-#define FILE_DIR "icons/mob/in-hand/left"
-#define FILE_DIR "icons/mob/in-hand/right"
-#define FILE_DIR "icons/mob/otherHuman"
-#define FILE_DIR "icons/mob/species"
-#define FILE_DIR "icons/mob/species/armalis"
-#define FILE_DIR "icons/mob/species/skrell"
-#define FILE_DIR "icons/mob/species/tajaran"
-#define FILE_DIR "icons/mob/species/unathi"
-#define FILE_DIR "icons/mob/species/vox"
-#define FILE_DIR "icons/mob/spirits"
-#define FILE_DIR "icons/NTOS"
-#define FILE_DIR "icons/NTOS/battery_icons"
-#define FILE_DIR "icons/obj"
-#define FILE_DIR "icons/obj/assemblies"
-#define FILE_DIR "icons/obj/atmospherics"
-#define FILE_DIR "icons/obj/clothing"
-#define FILE_DIR "icons/obj/doors"
-#define FILE_DIR "icons/obj/flora"
-#define FILE_DIR "icons/obj/machines"
-#define FILE_DIR "icons/obj/pipes"
-#define FILE_DIR "icons/obj/power_cond"
-#define FILE_DIR "icons/pda_icons"
-#define FILE_DIR "icons/pods"
-#define FILE_DIR "icons/spideros_icons"
-#define FILE_DIR "icons/stamp_icons"
-#define FILE_DIR "icons/Testing"
-#define FILE_DIR "icons/turf"
-#define FILE_DIR "icons/vehicles"
-#define FILE_DIR "icons/vending_icons"
-#define FILE_DIR "maps"
-#define FILE_DIR "maps/overmap"
-#define FILE_DIR "maps/overmap/bearcat"
-#define FILE_DIR "nano"
-#define FILE_DIR "nano/images"
-#define FILE_DIR "sound"
-#define FILE_DIR "sound/AI"
-#define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/effects"
-#define FILE_DIR "sound/effects/turret"
-#define FILE_DIR "sound/effects/wind"
-#define FILE_DIR "sound/hallucinations"
-#define FILE_DIR "sound/items"
-#define FILE_DIR "sound/machines"
-#define FILE_DIR "sound/mecha"
-#define FILE_DIR "sound/misc"
-#define FILE_DIR "sound/music"
-#define FILE_DIR "sound/piano"
-#define FILE_DIR "sound/turntable"
-#define FILE_DIR "sound/violin"
-#define FILE_DIR "sound/voice"
-#define FILE_DIR "sound/voice/complionator"
-#define FILE_DIR "sound/voice/Serithi"
-#define FILE_DIR "sound/vox"
-#define FILE_DIR "sound/vox_fem"
-#define FILE_DIR "sound/weapons"
// END_FILE_DIR
// BEGIN_PREFERENCES
#define DEBUG
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index ffa8e8d2e8a..72330960a76 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -165,16 +165,17 @@
m_type = 1
if ("cough")
- if(miming)
- message = "[src] appears to cough!"
- m_type = 1
- else
- if (!muzzled)
- message = "[src] coughs!"
- m_type = 2
+ if(!reagents.has_reagent("dextromethorphan"))
+ if(miming)
+ message = "[src] appears to cough!"
+ m_type = 1
else
- message = "[src] makes a strong noise."
- m_type = 2
+ if (!muzzled)
+ message = "[src] coughs!"
+ m_type = 2
+ else
+ message = "[src] makes a strong noise."
+ m_type = 2
if ("frown")
message = "[src] frowns."
diff --git a/code/modules/reagents/Chemistry-Reagents-Recreational.dm b/code/modules/reagents/Chemistry-Reagents-Recreational.dm
index 20605fb3544..1192f980c38 100644
--- a/code/modules/reagents/Chemistry-Reagents-Recreational.dm
+++ b/code/modules/reagents/Chemistry-Reagents-Recreational.dm
@@ -4,34 +4,100 @@
description = "Cough medicine."
reagent_state = LIQUID
color = "#FF1111"
- custom_metabolism = 0.25
+ custom_metabolism = 0.01
data = 0
+ var/message = 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- if(!data) data = 1
- data++
-
- switch(data)
- if(1 to 20)
- M << "\red Light Dose.."
- if(20 to 40)
- M << "\red Medium Dose.."
- if(prob(10)) M.emote(pick("giggle"))
- if(40 to 80)
- M << "\red High Dose.."
- M.druggy = max(M.druggy, 30)
+ if(!data) data = 0
+ if(!message) message = 0
+ data += custom_metabolism
+ switch(data + src.volume)
+ if(1 to 5)
+ if(message == 0)
+ M << "\red Your throat feels better and you stop coughing."
+ //The coughing check is made in carbon/human/emote.dm where it checks after this reagent.
+ message = 1
+ if(5 to 10)
+ if(message < 2)
+ M << "\red You feel full of strength and energy! You're getting restless!"
+ message = 2
+ if(prob(5)) M.emote(pick("giggle"))
+ if(10 to 20)
+ if(message < 3)
+ M << "\red Your heartrate is racing. You feel euphoric!"
+ message = 3
+ M.druggy = max(M.druggy, 15)
if(prob(5)) M.emote(pick("twitch_s", "giggle"))
- if(80 to INFINITY)
- M << "\red Overdose.."
- M.druggy = max(M.druggy, 30)
- if(prob(10)) M.emote(pick("twitch","giggle"))
- M:paralysis = max(M:paralysis, 30)
- M.hallucination = max(M.hallucination, 30)
+ if(20 to INFINITY)
+ if(message < 4)
+ M << "\red Your heart is racing and your body won't respond properly. You almost feel like you're on autopilot."
+ message = 4
+ M.druggy = max(M.druggy, 15)
+ if(prob(10)) M.emote(pick("twitch","giggle","drool"))
+ if(prob(10)) M:weakened = max(M:weakened, 10)
+ M.hallucination = max(M.hallucination, 5)
+ ..()
+ return
/datum/chemical_reaction/dextromethorphan
name = "Dextromethorphan"
id = "dextromethorphan"
result = "dextromethorphan"
required_reagents = list("cryptobiolin" = 1, "hydrogen" = 1, "carbon" = 1)
- result_amount = 3
\ No newline at end of file
+ result_amount = 3
+
+/datum/reagent/antidepressant/mdma
+ name = "MDMA"
+ id = "mdma"
+ description = "MDMA is one of the most popular recreational psychoactives, most commonly sold in the form of 'ecstasy' tablets. It is known for its empathogenic, euphoric, and stimulant effects, and has also been used in psychotherapy."
+ reagent_state = LIQUID
+ color = "#EEEEEE"
+ custom_metabolism = 0.01
+ data = 0
+ var/message = 0
+
+/* Not finished -Mel
+ on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(!data) data = 0
+ if(!message) message = 0
+ data += custom_metabolism
+ switch(data + src.volume)
+ if(1 to 5)
+ if(message == 0)
+ M << "\red Your heart rate increases. Your senses all seem more amplified. You start to feel... euphoric."
+ message = 1
+ M.druggy = max(M.druggy, 15)
+ if(prob(5)) M.emote(pick("giggle"))
+ if(5 to 10)
+ if(message < 2)
+ M << "\red Your heart rate increases. Your senses all seem more amplified. You start to feel... euphoric."
+ message = 2
+ M.druggy = max(M.druggy, 15)
+ if(prob(5)) M.emote(pick("giggle"))
+ if(10 to 20)
+ if(message < 3)
+ M << "\red Your heart rate increases. Your senses all seem more amplified. You start to feel... euphoric."
+ message = 3
+ M.druggy = max(M.druggy, 15)
+ if(prob(5)) M.emote(pick("giggle"))
+ if(20 to INFINITY)
+ if(message < 4)
+ M << "\red That was probably too much..."
+ message = 4
+ M.druggy = max(M.druggy, 15)
+ if(prob(10)) M.emote(pick("twitch","giggle","drool"))
+ if(prob(10)) M:weakened = max(M:weakened, 10)
+ M.hallucination = max(M.hallucination, 5)
+ ..()
+ return
+
+/datum/chemical_reaction/mdma
+ name = "MDMA"
+ id = "mdma"
+ result = "mdma"
+ required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1, "sugar" = 1)
+ result_amount = 3
+*/
\ No newline at end of file