diff --git a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm b/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm
index af38b559489..392d9101c6d 100644
--- a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm
+++ b/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm
@@ -68,11 +68,18 @@
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
- if(prob(90))
- M << "\blue Your mind feels much more stable."
+ if(volume > 5) // Bone White - Added any concentrations over 5 units to cause higher chance of mind breakage.
+ if (prob(min(100, volume * 5)))
+ M << "\red Your mind breaks apart.."
+ M.hallucination += 200
+ else
+ M << "\blue Your mind feels much more stable."
else
- M << "\red Your mind breaks apart.."
- M.hallucination += 200
+ if (prob(90))
+ M << "\blue Your mind feels much more stable."
+ else
+ M << "\red Your mind breaks apart.."
+ M.hallucination += 200
..()
return
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 34dda1f2064..a52bf3f4054 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -108,13 +108,13 @@ datum
if( (toxod > 0) && (volume >= toxod))//Toxin Overdosing
M.adjustToxLoss(overdose_dam * volume / toxod)
-
+
if( (bruteod > 0) && (volume >= bruteod))//Brute Overdosing
M.take_overall_damage(overdose_dam * volume / bruteod, 0)
-
+
if( (burnod > 0) && (volume >= burnod))//Burn Overdosing
M.take_overall_damage(0, overdose_dam * volume / burnod)
-
+
if( (oxyod > 0) && (volume >= oxyod))//Oxygen Overdosing
M.adjustOxyLoss(overdose_dam * volume / oxyod)
@@ -363,7 +363,7 @@ datum
color = "#006400" // rgb: 0, 100, 0
bruteod = BRUTE_OVERDOSE
burnod = BURN_OVERDOSE
-
+ mildly_toxic = 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(holder.has_reagent("toxin"))
@@ -526,8 +526,8 @@ datum
description = "An effective hypnotic used to treat insomnia."
reagent_state = LIQUID
color = "#E895CC" // rgb: 232, 149, 204
- toxod = TOX_OVERDOSE
- oxyod = OXY_OVERDOSE
+ toxod = 40
+ oxyod = 40
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -550,7 +550,7 @@ datum
description = "Put people to sleep, and heals them."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
-
+ mildly_toxic = 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
@@ -583,8 +583,8 @@ datum
description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
- bruteod = BRUTE_OVERDOSE
- oxyod = OXY_OVERDOSE
+ bruteod = 40
+ oxyod = 40
scannable = 1
on_mob_life(var/mob/living/M as mob, var/alien)
@@ -723,7 +723,7 @@ datum
id = "oxygen"
description = "A colorless, odorless gas."
reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
+ color = "#808080" // rgb: 128, 128, 128
custom_metabolism = 0.01
@@ -1636,8 +1636,10 @@ datum
description = "Dexalin is used in the treatment of oxygen deprivation."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
- toxod = TOX_OVERDOSE
- burnod = BURN_OVERDOSE
+ toxod = 40
+ burnod = 40
+ bruteod = 40
+ oxyod = 40
scannable = 1
on_mob_life(var/mob/living/M as mob, var/alien)
diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index 456b7ecc819..f73b325190f 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -200,6 +200,13 @@
////////////////////////STAGE 4/////////////////////////////////
+/datum/disease2/effect/alchdranine
+ name = "Panacea Effect"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.reagents.get_reagent_amount("alchdranine") < 1)
+ mob.reagents.add_reagent("alchdranine", 1)
+
/datum/disease2/effect/viralsputum_major
name = "Hemoptysis"
stage = 4
@@ -210,7 +217,7 @@
if(D==null)
D = new(get_turf(mob))
D.virus2 |= virus_copylist(mob.virus2)
- mob.reagents.remove_reagent("blood", 50) // Bone White - Blood loss when coughing up blood, experimental, may need adjusting.
+ mob.reagents.remove_reagent("blood", 20) // Bone White - Blood loss when coughing up blood, experimental, may need adjusting.
else
/datum/disease2/effect/gibbingtons
@@ -507,6 +514,28 @@
////////////////////////STAGE 3/////////////////////////////////
+/datum/disease2/effect/brain_regen
+ name = "Regenerative Synapse Effect"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.reagents.get_reagent_amount("alkysine") < 1)
+ mob.reagents.add_reagent("alkysine", 1)
+
+/datum/disease2/effect/paroxetine
+ name = "Psyche Collapse Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.reagents.get_reagent_amount("paroxetine") < 10)
+ mob.reagents.add_reagent("paroxetine", 1)
+
+/datum/disease2/effect/pain_major
+ name = "Phantom Pain Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.halloss < 100)
+ mob << " You feel like your body is on fire. Make the pain stop!"
+ mob.apply_effect(20,AGONY,0)
+
// === burn brute toxin clone brain damage symptoms - Bone White ===
/datum/disease2/effect/burn
@@ -779,15 +808,23 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
*/
-/datum/disease2/effect/paroxetine
- name = "Psyche Collapse Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("paroxetine") < 5)
- mob.reagents.add_reagent("paroxetine", 1)
-
////////////////////////STAGE 2/////////////////////////////////
+/datum/disease2/effect/methylphenidate
+ name = "Mental Stability Phenomenon"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.reagents.get_reagent_amount("methylphenidate") < 5)
+ mob.reagents.add_reagent("methylphenidate", 1)
+
+/datum/disease2/effect/pain
+ name = "Acute Muscle Ache"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.halloss < 50)
+ mob << "You ache all over!"
+ mob.apply_effect(10,AGONY,0)
+
// === burn brute toxin clone brain damage symptoms - Bone White ===
/datum/disease2/effect/burn
@@ -885,14 +922,14 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
H.h_style = "Balding Hair"
H.update_hair()
-/datum/disease2/effect/stimulant
- name = "Adrenaline Extra"
+/datum/disease2/effect/stimulant_major
+ name = "Adrenal Overload"
stage = 2
activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "You feel a rush of energy inside you!"
- if (mob.reagents.get_reagent_amount("hyperzine") < 10)
+ if (mob.reagents.get_reagent_amount("hyperzine") < 40)
mob.reagents.add_reagent("hyperzine", 4)
if (prob(30))
+ mob << "You feel a rush of energy inside you!"
mob.jitteriness += 10
/datum/disease2/effect/drunk
@@ -950,7 +987,7 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
if(D==null)
D = new(get_turf(mob))
D.virus2 |= virus_copylist(mob.virus2)
- mob.reagents.remove_reagent("blood", 20) // Bone White - Blood loss when coughing up blood, experimental, may need adjusting.
+ mob.reagents.remove_reagent("blood", 5) // Bone White - Blood loss when coughing up blood, experimental, may need adjusting.
/datum/disease2/effect/lantern
@@ -972,7 +1009,30 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
////////////////////////STAGE 1/////////////////////////////////
+/datum/disease2/effect/citalopram
+ name = "Reality Check"
+ stage = 1
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.reagents.get_reagent_amount("citalopram") < 5)
+ mob.reagents.add_reagent("citalopram", 1)
+/datum/disease2/effect/pain_minor
+ name = "Heightened Sensitivity"
+ stage = 1
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.halloss < 20)
+ mob << "Your body aches."
+ mob.apply_effect(5,AGONY,0)
+
+/datum/disease2/effect/stimulant
+ name = "Adrenaline Extra"
+ stage = 1
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (mob.reagents.get_reagent_amount("hyperzine") < 10)
+ mob.reagents.add_reagent("hyperzine", 4)
+ if (prob(30))
+ mob << "You feel a rush of energy inside you!"
+ mob.jitteriness += 10
/datum/disease2/effect/cough_minor
name = "Trachea Sensitivity"