diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index 4452cc840c..59c11f505a 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -140,7 +140,7 @@
M.drowsyness = max(0, M.drowsyness - 3 * removed * chem_effective)
M.hallucination = max(0, M.hallucination - 6 * removed * chem_effective)
M.adjustToxLoss(-2 * removed * chem_effective)
-
+
/datum/reagent/carthatoline
name = "Carthatoline"
id = "carthatoline"
@@ -657,19 +657,24 @@
mrate_static = TRUE
overdose = REAGENTS_OVERDOSE
scannable = 1
- data = 0
+ //data = 0
/datum/reagent/spaceacillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(alien == IS_SLIME)
- if(volume <= 0.1 && data != -1)
- data = -1
- to_chat(M, "You regain focus...")
- else
- var/delay = (5 MINUTES)
- if(world.time > data + delay)
- data = world.time
- to_chat(M, "Your senses feel unfocused, and divided.")
+// if(volume <= 0.1 && data != -1)
+// data = -1
+// else
+// var/delay = (5 MINUTES)
+// if(world.time > data + delay)
+// data = world.time
+// to_chat(M, "Your senses feel unfocused, and divided.")
+
+// Erik's Edit: Fixes spam chems!
+ if(volume <= metabolism)
+ to_chat(M, "You regain focus...")
+ if(dose <= metabolism)
+ to_chat(M, "Your senses feel unfocused, and divided.")
M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM)
/datum/reagent/corophizine
@@ -851,21 +856,27 @@
color = "#BF80BF"
metabolism = 0.01
mrate_static = TRUE
- data = 0
- var/delay = 0
+// data = 0
+// var/delay = 0
/datum/reagent/methylphenidate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!delay)
delay = world.time
if(alien == IS_DIONA)
return
- if(volume <= 0.1 && data != -1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
- delay = world.time
+// if(volume <= 0.1 && data != -1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
+// delay = world.time
+// M << "You lose focus..."
+// else
+// if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
+// delay = world.time
+// M << "Your mind feels focused and undivided."
+
+// Erik's Edit: Fixes spam chems!
+ if(volume <= metabolism)
M << "You lose focus..."
- else
- if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
- delay = world.time
- M << "Your mind feels focused and undivided."
+ if(dose <= metabolism)
+ M << "Your mind feels focused and undivided."
/datum/reagent/citalopram
name = "Citalopram"
@@ -884,13 +895,19 @@
delay = world.time
if(alien == IS_DIONA)
return
- if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
- delay = world.time
+// if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
+// delay = world.time
+// to_chat(M, "Your mind feels a little less stable...")
+// else
+// if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
+// delay = world.time
+// to_chat(M, "Your mind feels stable... a little stable.")
+
+// Erik's Edit: Fixes spam chems!
+ if(volume <= metabolism)
to_chat(M, "Your mind feels a little less stable...")
- else
- if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
- delay = world.time
- to_chat(M, "Your mind feels stable... a little stable.")
+ if(dose <= metabolism)
+ to_chat(M, "Your mind feels stable... a little stable.")
/datum/reagent/paroxetine
name = "Paroxetine"
@@ -901,23 +918,33 @@
color = "#FF80BF"
metabolism = 0.01
mrate_static = TRUE
- data = 0
- var/delay = 0
+ //data = 0
+ //var/delay = 0
/datum/reagent/paroxetine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
- if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
- delay = world.time
+// if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
+// delay = world.time
+// M << "Your mind feels much less stable..."
+// else
+// if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
+// delay = world.time
+// if(prob(90))
+// M << "Your mind feels much more stable."
+// else
+// M << "Your mind breaks apart..."
+// M.hallucination += 200
+
+// Erik's Edit: Fixes spam chems!
+ if(volume <= metabolism)
M << "Your mind feels much less stable..."
- else
- if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
- delay = world.time
- if(prob(90))
- M << "Your mind feels much more stable."
- else
- M << "Your mind breaks apart..."
- M.hallucination += 200
+ if(dose <= metabolism)
+ if(prob(90))
+ M << "Your mind feels much more stable."
+ else
+ M << "Your mind breaks apart..."
+ M.hallucination += 200
/datum/reagent/qerr_quem
name = "Qerr-quem"
@@ -928,18 +955,24 @@
color = "#e6efe3"
metabolism = 0.01
mrate_static = TRUE
- data = 0
+// data = 0
/datum/reagent/qerr_quem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
- if(volume <= 0.1 && data != -1)
- data = -1
+// if(volume <= 0.1 && data != -1)
+// data = -1
+// to_chat(M, "You feel antsy, your concentration wavers...")
+// else
+// if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
+// data = world.time
+// to_chat(M, "You feel invigorated and calm.")
+
+// Erik's Edit: Fixes spam chems!
+ if(volume <= metabolism)
to_chat(M, "You feel antsy, your concentration wavers...")
- else
- if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
- data = world.time
- to_chat(M, "You feel invigorated and calm.")
+ if(dose <= metabolism)
+ to_chat(M, "You feel invigorated and calm.")
// This exists to cut the number of chemicals a merc borg has to juggle on their hypo.
/datum/reagent/healing_nanites