diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index 818dfc52f97..456b7ecc819 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -39,6 +39,13 @@
////////////////////////EFFECTS/////////////////////////////////
////////////////////////////////////////////////////////////////
+// Badness : 1 means can be a minor viral outbreak event symptom
+// it can also be a major mutation
+// 2 means can be a major or minor viral outbreak event symptom
+// it can also be a major mutation
+// 3 means it cannot be in a viral outbreak event
+// it cannot be a major mutation
+
/datum/disease2/effect
var/chance_maxm = 50
var/name = "Blanking effect"
@@ -66,16 +73,146 @@
mob:gib()
del D
+
/datum/disease2/effect/invisible
name = "Waiting Syndrome"
stage = 1
activate(var/mob/living/carbon/mob,var/multiplier)
return
+// Bone White - Empty sypmtoms. There is a better way of handling this but this is much faster.
+
+/datum/disease2/effect/invisible_stage_onea
+ name = "Non-existant Syndrome"
+ stage = 1
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_oneb
+ name = "Non-existant Syndrome"
+ stage = 1
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+
+/datum/disease2/effect/invisible_stage_twoa
+ name = "Non-existant Syndrome"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_twob
+ name = "Non-existant Syndrome"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_twoc
+ name = "Non-existant Syndrome"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_twod
+ name = "Non-existant Syndrome"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+
+/datum/disease2/effect/invisible_stage_threea
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_threeb
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_threec
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_threed
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_threee
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_threef
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_threeg
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_threeh
+ name = "Non-existant Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+
+/datum/disease2/effect/invisible_stage_foura
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_fourb
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_fourc
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_fourd
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_foure
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_fourf
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_fourg
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+/datum/disease2/effect/invisible_stage_fourh
+ name = "Non-existant Syndrome"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ return
+
////////////////////////STAGE 4/////////////////////////////////
+/datum/disease2/effect/viralsputum_major
+ name = "Hemoptysis"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if (prob(60))
+ mob.say("*cough")
+ var/obj/effect/decal/cleanable/blood/viralsputum/D= locate(/obj/effect/decal/cleanable/blood/viralsputum) in get_turf(mob)
+ 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.
+ else
+
/datum/disease2/effect/gibbingtons
name = "Gibbingtons Syndrome"
stage = 4
@@ -83,6 +220,10 @@
activate(var/mob/living/carbon/mob,var/multiplier)
mob.gib()
+/datum/disease2/effect/blank_stage_4
+ name = "Nonexistant Syndrome"
+ stage = 4
+
/datum/disease2/effect/radian
name = "Radian's Syndrome"
stage = 4
@@ -119,13 +260,28 @@
spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds
mob.suiciding = 0
-/datum/disease2/effect/killertoxins
- name = "Toxification Syndrome"
+
+// === burn brute toxin clone brain damage symptoms - Bone White ===
+
+/datum/disease2/effect/burn_major
+ name = "Blood Plasma Pyroclastia"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.take_overall_damage(0,15)
+
+/datum/disease2/effect/brute_major
+ name = "Exploding Cell Phenomenon"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.take_overall_damage(15,0)
+
+/datum/disease2/effect/toxin_major
+ name = "Acute Kidney Failure"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
mob.adjustToxLoss(15*multiplier)
-/datum/disease2/effect/dna
+/datum/disease2/effect/clone_major
name = "Reverse Pattern Syndrome"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
@@ -133,6 +289,20 @@
scramble(0,mob,10)
mob.apply_damage(10, CLONE)
+/datum/disease2/effect/brain_major
+ name = "Cortical Liquification"
+ stage = 4
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if(istype(mob, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = mob
+ var/datum/organ/internal/brain/B = H.internal_organs_by_name["brain"]
+ if (B.damage < B.min_broken_damage)
+ B.take_damage(5)
+ else
+ mob.setBrainLoss(50)
+
+
+
/datum/disease2/effect/organs
name = "Shutdown Syndrome"
stage = 4
@@ -337,6 +507,64 @@
////////////////////////STAGE 3/////////////////////////////////
+// === burn brute toxin clone brain damage symptoms - Bone White ===
+
+/datum/disease2/effect/burn
+ name = "Flammable inflammation"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.take_overall_damage(0,5)
+
+/datum/disease2/effect/brute
+ name = "Continuous Contusions"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.take_overall_damage(5,0)
+
+/datum/disease2/effect/toxin
+ name = "Hyperacidity"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.adjustToxLoss(15*multiplier)
+
+/datum/disease2/effect/clone
+ name = "DNA Breakdown Effect"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.bodytemperature = max(mob.bodytemperature, 350)
+ scramble(0,mob,5)
+ mob.apply_damage(5, CLONE)
+
+/datum/disease2/effect/brain
+ name = "Synapse Distancing"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if(istype(mob, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = mob
+ var/datum/organ/internal/brain/B = H.internal_organs_by_name["brain"]
+ if (B.damage < B.min_broken_damage)
+ B.take_damage(1)
+ else
+ mob.setBrainLoss(10)
+
+
+/datum/disease2/effect/lantern_major
+ name = "Lantern Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.SetLuminosity(5)
+ mob << "You are glowing brightly!"
+
+
+/datum/disease2/effect/cough_major
+ name = "Acute Tussis"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.say("*cough")
+ for(var/mob/living/carbon/M in oview(3,mob))
+ mob.spread_disease_to(M)
+
+
/datum/disease2/effect/bones
name = "Fragile Bones Syndrome"
stage = 3
@@ -352,14 +580,6 @@
for (var/datum/organ/external/E in H.organs)
E.min_broken_damage = initial(E.min_broken_damage)
-
-/datum/disease2/effect/toxins
- name = "Hyperacidity"
- stage = 3
- maxm = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.adjustToxLoss((2*multiplier))
-
/datum/disease2/effect/shakey
name = "World Shaking Syndrome"
stage = 3
@@ -375,18 +595,6 @@
mob.dna.SetSEState(REMOTETALKBLOCK,1)
domutcheck(mob, null)
-/datum/disease2/effect/mind
- name = "Lazy Mind Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- var/datum/organ/internal/brain/B = H.internal_organs_by_name["brain"]
- if (B.damage < B.min_broken_damage)
- B.take_damage(5)
- else
- mob.setBrainLoss(50)
-
/datum/disease2/effect/hallucinations
name = "Hallucinational Syndrome"
stage = 3
@@ -412,13 +620,6 @@
mob << "You have trouble telling right and left apart all of a sudden."
mob.confused += 10
-/datum/disease2/effect/mutation
- name = "DNA Degradation"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.apply_damage(2, CLONE)
-
-
/datum/disease2/effect/groan
name = "Groaning Syndrome"
stage = 3
@@ -577,8 +778,57 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
I.damage = 0
*/
+
+/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/////////////////////////////////
+// === burn brute toxin clone brain damage symptoms - Bone White ===
+
+/datum/disease2/effect/burn
+ name = "Prickly Heat Syndrome"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.take_overall_damage(0,2)
+
+/datum/disease2/effect/brute
+ name = "Continuous Contusions"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.take_overall_damage(2,0)
+
+/datum/disease2/effect/toxin
+ name = "White Blood Cell Putrification"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.adjustToxLoss(5*multiplier)
+
+/datum/disease2/effect/clone
+ name = "RNA Compound Corruption"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.bodytemperature = max(mob.bodytemperature, 350)
+ scramble(0,mob,5)
+ mob.apply_damage(5, CLONE)
+
+/datum/disease2/effect/brain
+ name = "Synapse Distancing"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if(istype(mob, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = mob
+ var/datum/organ/internal/brain/B = H.internal_organs_by_name["brain"]
+ if (B.damage < B.min_broken_damage)
+ B.take_damage(0.5)
+ else
+ mob.setBrainLoss(5)
+
+
/datum/disease2/effect/scream
name = "Loudness Syndrome"
stage = 2
@@ -681,7 +931,7 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
name = "Uncontrollable Bowel Syndrome"
stage = 2
activate(var/mob/living/carbon/mob,var/multiplier)
- if (prob(50))
+ if (prob(70)) // Bone White - Lessened the chance for actually shitting yourself.
mob << "[pick("Your stomach rumbles strangely.", "You feel like you're going shit your pants any second now!")]"
else
mob.visible_message("[mob] has explosive diarrhea all over the floor!")
@@ -700,19 +950,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)
-
-
-/datum/disease2/effect/viralsputum
- name = "Respiratory Putrification"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
-
- if (prob(30))
- mob.say("*cough")
- var/obj/effect/decal/cleanable/blood/viralsputum/D= locate(/obj/effect/decal/cleanable/blood/viralsputum) in get_turf(mob)
- 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.
/datum/disease2/effect/lantern
@@ -723,8 +961,27 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
mob << "You are glowing!"
+/datum/disease2/effect/optimistic
+ name = "Full Glass Syndrome"
+ stage = 2
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob << " You feel optimistic!"
+ if (mob.reagents.get_reagent_amount("tricordrazine") < 1)
+ mob.reagents.add_reagent("tricordrazine", 1)
+
+
////////////////////////STAGE 1/////////////////////////////////
+
+
+/datum/disease2/effect/cough_minor
+ name = "Trachea Sensitivity"
+ stage = 1
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ mob.say("*cough")
+ for(var/mob/living/carbon/M in oview(1,mob))
+ mob.spread_disease_to(M)
+
/datum/disease2/effect/sneeze
name = "Coldingtons Effect"
stage = 1
@@ -793,10 +1050,8 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
mob.emote("me",1,"wheezes.")
-/datum/disease2/effect/optimistic
- name = "Full Glass Syndrome"
+/datum/disease2/effect/optimistic_minor
+ name = "Glass Half Full Syndrome"
stage = 1
activate(var/mob/living/carbon/mob,var/multiplier)
mob << " You feel optimistic!"
- if (mob.reagents.get_reagent_amount("tricordrazine") < 1)
- mob.reagents.add_reagent("tricordrazine", 1)