From d319715b88592d1eb8c2750e5d53da4c9d1438ef Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 11:11:29 -0800
Subject: [PATCH 01/21] new procs

---
 code/datums/diseases/advance/advance.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 6a41b710..ed0cc337 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -354,10 +354,12 @@
 	else
 		RemoveSymptom(pick(symptoms))
 		symptoms += S
+		S.OnAdd(src)
 
 // Simply removes the symptom.
 /datum/disease/advance/proc/RemoveSymptom(datum/symptom/S)
 	symptoms -= S
+	S.OnRemove(src)
 
 // Neuter a symptom, so it will only affect stats
 /datum/disease/advance/proc/NeuterSymptom(datum/symptom/S)

From 276de56753b63bf8325a30fbdfc52a1ebd3af623 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 11:12:50 -0800
Subject: [PATCH 02/21] before i even finish compile cuz im cool like that

---
 .../diseases/advance/symptoms/choking.dm      |  70 --
 code/datums/diseases/advance/symptoms/fire.dm |  14 +-
 .../diseases/advance/symptoms/genetics.dm     | 160 ++--
 .../diseases/advance/symptoms/hallucigen.dm   |  12 +-
 code/datums/diseases/advance/symptoms/heal.dm | 881 +++++++++---------
 .../diseases/advance/symptoms/oxygen.dm       | 118 +--
 code/datums/diseases/advance/symptoms/skin.dm |  43 +
 .../diseases/advance/symptoms/sneeze.dm       |   6 +-
 .../diseases/advance/symptoms/species.dm      |  17 +-
 .../diseases/advance/symptoms/symptoms.dm     |  13 +-
 .../diseases/advance/symptoms/vision.dm       |   4 +-
 .../datums/diseases/advance/symptoms/vomit.dm |   6 +-
 .../diseases/advance/symptoms/weight.dm       |   6 +-
 13 files changed, 652 insertions(+), 698 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm
index 48f68e69..b6e8d9a3 100644
--- a/code/datums/diseases/advance/symptoms/choking.dm
+++ b/code/datums/diseases/advance/symptoms/choking.dm
@@ -1,76 +1,6 @@
 /*
 //////////////////////////////////////
 
-Choking
-
-	Very very noticable.
-	Lowers resistance.
-	Decreases stage speed.
-	Decreases transmittablity tremendously.
-	Moderate Level.
-
-Bonus
-	Inflicts spikes of oxyloss
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/choking
-
-	name = "Choking"
-	desc = "The virus causes inflammation of the host's air conduits, leading to intermittent choking."
-	stealth = -3
-	resistance = -2
-	stage_speed = -2
-	transmittable = -4
-	level = 3
-	severity = 3
-	base_message_chance = 15
-	symptom_delay_min = 10
-	symptom_delay_max = 30
-	threshold_desc = "<b>Stage Speed 8:</b> Causes choking more frequently.<br>\
-					  <b>Stealth 4:</b> The symptom remains hidden until active."
-
-/datum/symptom/choking/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 8)
-		symptom_delay_min = 7
-		symptom_delay_max = 24
-	if(A.properties["stealth"] >= 4)
-		suppress_warning = TRUE
-
-/datum/symptom/choking/Activate(datum/disease/advance/A)
-	if(!..())
-		return
-	var/mob/living/M = A.affected_mob
-	switch(A.stage)
-		if(1, 2)
-			if(prob(base_message_chance) && !suppress_warning)
-				to_chat(M, "<span class='warning'>[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]</span>")
-		if(3, 4)
-			if(!suppress_warning)
-				to_chat(M, "<span class='warning'>[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]</span>")
-			else
-				to_chat(M, "<span class='warning'>You feel very [pick("dizzy","woozy","faint")].</span>") //fake bloodloss messages
-			Choke_stage_3_4(M, A)
-			M.emote("gasp")
-		else
-			to_chat(M, "<span class='userdanger'>[pick("You're choking!", "You can't breathe!")]</span>")
-			Choke(M, A)
-			M.emote("gasp")
-
-/datum/symptom/choking/proc/Choke_stage_3_4(mob/living/M, datum/disease/advance/A)
-	M.adjustOxyLoss(rand(6,13))
-	return 1
-
-/datum/symptom/choking/proc/Choke(mob/living/M, datum/disease/advance/A)
-	M.adjustOxyLoss(rand(10,18))
-	return 1
-
-/*
-//////////////////////////////////////
-
 Asphyxiation
 
 	Very very noticable.
diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm
index bb1da9ac..1c1aa856 100644
--- a/code/datums/diseases/advance/symptoms/fire.dm
+++ b/code/datums/diseases/advance/symptoms/fire.dm
@@ -20,9 +20,9 @@ Bonus
 	name = "Spontaneous Combustion"
 	desc = "The virus turns fat into an extremely flammable compound, and raises the body's temperature, making the host burst into flames spontaneously."
 	stealth = 1
-	resistance = -4
-	stage_speed = -4
-	transmittable = -4
+	resistance = -2
+	stage_speed = -3
+	transmittable = -3
 	level = 6
 	severity = 5
 	base_message_chance = 20
@@ -73,12 +73,16 @@ Bonus
 	return 1
 
 /datum/symptom/fire/proc/Firestacks_stage_5(mob/living/M, datum/disease/advance/A)
-	M.adjust_fire_stacks(3 * power)
+	if(HAS_TRAIT(M, TRAIT_FAT))
+		M.adjust_fire_stacks(6 * power)
+	else
+		M.adjust_fire_stacks(3 * power)
 	M.take_overall_damage(burn = 5 * power, required_status = BODYPART_ORGANIC)
 	if(infective)
 		A.spread(4)
 	return 1
 
+
 /*
 //////////////////////////////////////
 
@@ -152,7 +156,7 @@ Bonus
 			M.IgniteMob()
 			to_chat(M, "<span class='userdanger'>Your skin erupts into an inferno!</span>")
 			M.emote("scream")
-			
+
 /datum/symptom/alkali/proc/Alkali_fire_stage_4(mob/living/M, datum/disease/advance/A)
 	var/get_stacks = 6 * power
 	M.adjust_fire_stacks(get_stacks)
diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm
index 49b229e5..87e6286e 100644
--- a/code/datums/diseases/advance/symptoms/genetics.dm
+++ b/code/datums/diseases/advance/symptoms/genetics.dm
@@ -1,78 +1,82 @@
-/*
-//////////////////////////////////////
-
-DNA Saboteur
-
-	Very noticable.
-	Lowers resistance tremendously.
-	No changes to stage speed.
-	Decreases transmittablity tremendously.
-	Fatal Level.
-
-Bonus
-	Cleans the DNA of a person and then randomly gives them a trait.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/genetic_mutation
-	name = "Deoxyribonucleic Acid Saboteur"
-	desc = "The virus bonds with the DNA of the host, causing damaging mutations until removed."
-	stealth = -2
-	resistance = -3
-	stage_speed = 0
-	transmittable = -3
-	level = 6
-	severity = 4
-	var/list/possible_mutations
-	var/archived_dna = null
-	base_message_chance = 50
-	symptom_delay_min = 60
-	symptom_delay_max = 120
-	var/no_reset = FALSE
-	threshold_desc = "<b>Resistance 8:</b> Causes two harmful mutations at once.<br>\
-					  <b>Stage Speed 10:</b> Increases mutation frequency.<br>\
-					  <b>Stealth 5:</b> The mutations persist even if the virus is cured."
-
-/datum/symptom/genetic_mutation/Activate(datum/disease/advance/A)
-	if(!..())
-		return
-	var/mob/living/carbon/C = A.affected_mob
-	if(!C.has_dna())
-		return
-	switch(A.stage)
-		if(4, 5)
-			to_chat(C, "<span class='warning'>[pick("Your skin feels itchy.", "You feel light headed.")]</span>")
-			C.dna.remove_mutation_group(possible_mutations)
-			for(var/i in 1 to power)
-				C.randmut(possible_mutations)
-
-// Archive their DNA before they were infected.
-/datum/symptom/genetic_mutation/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stealth"] >= 5) //don't restore dna after curing
-		no_reset = TRUE
-	if(A.properties["stage_rate"] >= 10) //mutate more often
-		symptom_delay_min = 20
-		symptom_delay_max = 60
-	if(A.properties["resistance"] >= 8) //mutate twice
-		power = 2
-	possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT]
-	var/mob/living/carbon/M = A.affected_mob
-	if(M)
-		if(!M.has_dna())
-			return
-		archived_dna = M.dna.mutation_index
-
-// Give them back their old DNA when cured.
-/datum/symptom/genetic_mutation/End(datum/disease/advance/A)
-	if(!..())
-		return
-	if(!no_reset)
-		var/mob/living/carbon/M = A.affected_mob
-		if(M && archived_dna)
-			if(!M.has_dna())
-				return
-			M.dna.mutation_index = archived_dna
-			M.domutcheck()
+/*
+//////////////////////////////////////
+
+DNA Saboteur
+
+	Very noticable.
+	Lowers resistance tremendously.
+	No changes to stage speed.
+	Decreases transmittablity tremendously.
+	Fatal Level.
+
+Bonus
+	Cleans the DNA of a person and then randomly gives them a trait.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/genetic_mutation
+	name = "Deoxyribonucleic Acid Saboteur"
+	desc = "The virus bonds with the DNA of the host, causing damaging mutations until removed."
+	stealth = -2
+	resistance = -3
+	stage_speed = 0
+	transmittable = -3
+	level = 6
+	severity = 4
+	var/list/possible_mutations
+	var/archived_dna = null
+	base_message_chance = 50
+	symptom_delay_min = 60
+	symptom_delay_max = 120
+	var/no_reset = FALSE
+	threshold_desc = "<b>Resistance 8:</b> Causes two harmful mutations at once.<br>\
+					  <b>Stage Speed 10:</b> Increases mutation frequency.<br>\
+					  <b>Stage Speed 14:</b> Mutations will be beneficial.<br>\
+					  <b>Stealth 5:</b> The mutations persist even if the virus is cured."
+
+/datum/symptom/genetic_mutation/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/carbon/C = A.affected_mob
+	if(!C.has_dna())
+		return
+	switch(A.stage)
+		if(4, 5)
+			to_chat(C, "<span class='warning'>[pick("Your skin feels itchy.", "You feel light headed.")]</span>")
+			C.dna.remove_mutation_group(possible_mutations)
+			for(var/i in 1 to power)
+				C.randmut(possible_mutations)
+
+// Archive their DNA before they were infected.
+/datum/symptom/genetic_mutation/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["stealth"] >= 5) //don't restore dna after curing
+		no_reset = TRUE
+	if(A.properties["stage_rate"] >= 10) //mutate more often
+		symptom_delay_min = 20
+		symptom_delay_max = 60
+	if(A.properties["resistance"] >= 8) //mutate twice
+		power = 2
+	if(A.properties["stage_rate"] >= 14)
+		possible_mutations = (GLOB.good_mutations) - GLOB.all_mutations[RACEMUT]
+	else
+		possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT]
+	var/mob/living/carbon/M = A.affected_mob
+	if(M)
+		if(!M.has_dna())
+			return
+		archived_dna = M.dna.mutation_index
+
+// Give them back their old DNA when cured.
+/datum/symptom/genetic_mutation/End(datum/disease/advance/A)
+	if(!..())
+		return
+	if(!no_reset)
+		var/mob/living/carbon/M = A.affected_mob
+		if(M && archived_dna)
+			if(!M.has_dna())
+				return
+			M.dna.mutation_index = archived_dna
+			M.domutcheck()
diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm
index 873d9605..86587abd 100644
--- a/code/datums/diseases/advance/symptoms/hallucigen.dm
+++ b/code/datums/diseases/advance/symptoms/hallucigen.dm
@@ -18,23 +18,23 @@ Bonus
 /datum/symptom/hallucigen
 	name = "Hallucigen"
 	desc = "The virus stimulates the brain, causing occasional hallucinations."
-	stealth = -2
+	stealth = 1
 	resistance = -3
-	stage_speed = -3
+	stage_speed = -1
 	transmittable = -1
 	level = 5
 	severity = 2
 	base_message_chance = 25
-	symptom_delay_min = 25
-	symptom_delay_max = 90
+	symptom_delay_min = 10
+	symptom_delay_max = 70
 	var/fake_healthy = FALSE
 	threshold_desc = "<b>Stage Speed 7:</b> Increases the amount of hallucinations.<br>\
-					  <b>Stealth 4:</b> The virus mimics positive symptoms.."
+					  <b>Stealth 2:</b> The virus mimics positive symptoms.."
 
 /datum/symptom/hallucigen/Start(datum/disease/advance/A)
 	if(!..())
 		return
-	if(A.properties["stealth"] >= 4) //fake good symptom messages
+	if(A.properties["stealth"] >= 2) //fake good symptom messages
 		fake_healthy = TRUE
 		base_message_chance = 50
 	if(A.properties["stage_rate"] >= 7) //stronger hallucinations
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index b8a52e0c..a133be00 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -1,466 +1,415 @@
-/datum/symptom/heal
-	name = "Basic Healing (does nothing)" //warning for adminspawn viruses
-	desc = "You should not be seeing this."
-	stealth = 0
-	resistance = 0
-	stage_speed = 0
-	transmittable = 0
-	level = -1 //not obtainable
-	base_message_chance = 20 //here used for the overlays
-	symptom_delay_min = 1
-	symptom_delay_max = 1
-	var/passive_message = "" //random message to infected but not actively healing people
-	threshold_desc = "<b>Stage Speed 6:</b> Doubles healing speed.<br>\
-					  <b>Stealth 4:</b> Healing will no longer be visible to onlookers."
-
-/datum/symptom/heal/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 6) //stronger healing
-		power = 2
-
-/datum/symptom/heal/Activate(datum/disease/advance/A)
-	if(!..())
-		return
-	var/mob/living/M = A.affected_mob
-	switch(A.stage)
-		if(4, 5)
-			var/effectiveness = CanHeal(A)
-			if(!effectiveness)
-				if(passive_message && prob(2) && passive_message_condition(M))
-					to_chat(M, passive_message)
-				return
-			else
-				Heal(M, A, effectiveness)
-	return
-
-/datum/symptom/heal/proc/CanHeal(datum/disease/advance/A)
-	return power
-
-/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A, actual_power)
-	return TRUE
-
-/datum/symptom/heal/proc/passive_message_condition(mob/living/M)
-	return TRUE
-
-
-/datum/symptom/heal/starlight
-	name = "Starlight Condensation"
-	desc = "The virus reacts to direct starlight, producing regenerative chemicals. Works best against toxin-based damage."
-	stealth = -1
-	resistance = -2
-	stage_speed = 0
-	transmittable = 1
-	level = 6
-	passive_message = "<span class='notice'>You miss the feeling of starlight on your skin.</span>"
-	var/nearspace_penalty = 0.3
-	threshold_desc = "<b>Stage Speed 6:</b> Increases healing speed.<br>\
-					  <b>Transmission 6:</b> Removes penalty for only being close to space."
-
-/datum/symptom/heal/starlight/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["transmittable"] >= 6)
-		nearspace_penalty = 1
-	if(A.properties["stage_rate"] >= 6)
-		power = 2
-
-/datum/symptom/heal/starlight/CanHeal(datum/disease/advance/A)
-	var/mob/living/M = A.affected_mob
-	if(istype(get_turf(M), /turf/open/space))
-		return power
-	else
-		for(var/turf/T in view(M, 2))
-			if(istype(T, /turf/open/space))
-				return power * nearspace_penalty
-
-/datum/symptom/heal/starlight/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
-	var/heal_amt = actual_power
-	if(M.getToxLoss() && prob(5))
-		to_chat(M, "<span class='notice'>Your skin tingles as the starlight seems to heal you.</span>")
-
-	M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins
-
-	var/list/parts = M.get_damaged_bodyparts(1,1)
-
-	if(!parts.len)
-		return
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len))
-			M.update_damage_overlays()
-	return 1
-
-/datum/symptom/heal/starlight/passive_message_condition(mob/living/M)
-	if(M.getBruteLoss() || M.getFireLoss() || M.getToxLoss())
-		return TRUE
-	return FALSE
-
-/datum/symptom/heal/chem
-	name = "Toxolysis"
-	stealth = 0
-	resistance = -2
-	stage_speed = 2
-	transmittable = -2
-	level = 7
-	var/food_conversion = FALSE
-	desc = "The virus rapidly breaks down any foreign chemicals in the bloodstream."
-	threshold_desc = "<b>Resistance 7:</b> Increases chem removal speed.<br>\
-					  <b>Stage Speed 6:</b> Consumed chemicals nourish the host."
-
-/datum/symptom/heal/chem/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 6)
-		food_conversion = TRUE
-	if(A.properties["resistance"] >= 7)
-		power = 2
-
-/datum/symptom/heal/chem/Heal(mob/living/M, datum/disease/advance/A, actual_power)
-	for(var/datum/reagent/R in M.reagents.reagent_list) //Not just toxins!
-		M.reagents.remove_reagent(R.id, actual_power)
-		if(food_conversion)
-			M.nutrition += 0.3
-		if(prob(2))
-			to_chat(M, "<span class='notice'>You feel a mild warmth as your blood purifies itself.</span>")
-	return 1
-
-
-
-/datum/symptom/heal/metabolism
-	name = "Metabolic Boost"
-	stealth = -1
-	resistance = -2
-	stage_speed = 2
-	transmittable = 1
-	level = 7
-	var/triple_metabolism = FALSE
-	var/reduced_hunger = FALSE
-	desc = "The virus causes the host's metabolism to accelerate rapidly, making them process chemicals twice as fast,\
-	 but also causing increased hunger."
-	threshold_desc = "<b>Stealth 3:</b> Reduces hunger rate.<br>\
-					  <b>Stage Speed 10:</b> Chemical metabolization is tripled instead of doubled."
-
-/datum/symptom/heal/metabolism/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 10)
-		triple_metabolism = TRUE
-	if(A.properties["stealth"] >= 3)
-		reduced_hunger = TRUE
-
-/datum/symptom/heal/metabolism/Heal(mob/living/carbon/C, datum/disease/advance/A, actual_power)
-	if(!istype(C))
-		return
-	C.reagents.metabolize(C, can_overdose=TRUE) //this works even without a liver; it's intentional since the virus is metabolizing by itself
-	if(triple_metabolism)
-		C.reagents.metabolize(C, can_overdose=TRUE)
-	C.overeatduration = max(C.overeatduration - 2, 0)
-	var/lost_nutrition = 9 - (reduced_hunger * 5)
-	C.nutrition = max(C.nutrition - (lost_nutrition * HUNGER_FACTOR), 0) //Hunger depletes at 10x the normal speed
-	if(prob(2))
-		to_chat(C, "<span class='notice'>You feel an odd gurgle in your stomach, as if it was working much faster than normal.</span>")
-	return 1
-
-/datum/symptom/heal/darkness
-	name = "Nocturnal Regeneration"
-	desc = "The virus is able to mend the host's flesh when in conditions of low light, repairing physical damage. More effective against brute damage."
-	stealth = 2
-	resistance = -1
-	stage_speed = -2
-	transmittable = -1
-	level = 6
-	passive_message = "<span class='notice'>You feel tingling on your skin as light passes over it.</span>"
-	threshold_desc = "<b>Stage Speed 8:</b> Doubles healing speed."
-
-/datum/symptom/heal/darkness/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 8)
-		power = 2
-
-/datum/symptom/heal/darkness/CanHeal(datum/disease/advance/A)
-	var/mob/living/M = A.affected_mob
-	var/light_amount = 0
-	if(isturf(M.loc)) //else, there's considered to be no light
-		var/turf/T = M.loc
-		light_amount = min(1,T.get_lumcount()) - 0.5
-		if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
-			return power
-
-/datum/symptom/heal/darkness/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
-	var/heal_amt = 2 * actual_power
-
-	var/list/parts = M.get_damaged_bodyparts(1,1)
-
-	if(!parts.len)
-		return
-
-	if(prob(5))
-		to_chat(M, "<span class='notice'>The darkness soothes and mends your wounds.</span>")
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5)) //more effective on brute
-			M.update_damage_overlays()
-	return 1
-
-/datum/symptom/heal/darkness/passive_message_condition(mob/living/M)
-	if(M.getBruteLoss() || M.getFireLoss())
-		return TRUE
-	return FALSE
-
-/datum/symptom/heal/coma
-	name = "Regenerative Coma"
-	desc = "The virus causes the host to fall into a death-like coma when severely damaged, then rapidly fixes the damage."
-	stealth = 0
-	resistance = 2
-	stage_speed = -3
-	transmittable = -2
-	level = 8
-	passive_message = "<span class='notice'>The pain from your wounds makes you feel oddly sleepy...</span>"
-	var/deathgasp = FALSE
-	var/active_coma = FALSE //to prevent multiple coma procs
-	threshold_desc = "<b>Stealth 2:</b> Host appears to die when falling into a coma.<br>\
-					  <b>Stage Speed 7:</b> Increases healing speed."
-
-/datum/symptom/heal/coma/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 7)
-		power = 1.5
-	if(A.properties["stealth"] >= 2)
-		deathgasp = TRUE
-
-/datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
-	var/mob/living/M = A.affected_mob
-	if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
-		return power
-	else if(M.IsUnconscious() || M.stat == UNCONSCIOUS)
-		return power * 0.9
-	else if(M.stat == SOFT_CRIT)
-		return power * 0.5
-	else if(M.IsSleeping())
-		return power * 0.25
-	else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
-		to_chat(M, "<span class='warning'>You feel yourself slip into a regenerative coma...</span>")
-		active_coma = TRUE
-		addtimer(CALLBACK(src, .proc/coma, M), 60)
-
-/datum/symptom/heal/coma/proc/coma(mob/living/M)
-	if(deathgasp)
-		M.emote("deathgasp")
-	M.fakedeath("regenerative_coma")
-	M.update_stat()
-	M.update_canmove()
-	addtimer(CALLBACK(src, .proc/uncoma, M), 300)
-
-/datum/symptom/heal/coma/proc/uncoma(mob/living/M)
-	if(!active_coma)
-		return
-	active_coma = FALSE
-	M.cure_fakedeath("regenerative_coma")
-	M.update_stat()
-	M.update_canmove()
-
-/datum/symptom/heal/coma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
-	var/heal_amt = 4 * actual_power
-
-	var/list/parts = M.get_damaged_bodyparts(1,1)
-
-	if(!parts.len)
-		return
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len))
-			M.update_damage_overlays()
-
-	if(active_coma && M.getBruteLoss() + M.getFireLoss() == 0)
-		uncoma(M)
-
-	return 1
-
-/datum/symptom/heal/coma/passive_message_condition(mob/living/M)
-	if((M.getBruteLoss() + M.getFireLoss()) > 30)
-		return TRUE
-	return FALSE
-
-/datum/symptom/heal/water
-	name = "Tissue Hydration"
-	desc = "The virus uses excess water inside and outside the body to repair damaged tissue cells. More effective against burns."
-	stealth = 0
-	resistance = -1
-	stage_speed = 0
-	transmittable = 1
-	level = 6
-	passive_message = "<span class='notice'>Your skin feels oddly dry...</span>"
-	var/absorption_coeff = 1
-	threshold_desc = "<b>Resistance 5:</b> Water is consumed at a much slower rate.<br>\
-					  <b>Stage Speed 7:</b> Increases healing speed."
-
-/datum/symptom/heal/water/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 7)
-		power = 2
-	if(A.properties["stealth"] >= 2)
-		absorption_coeff = 0.25
-
-/datum/symptom/heal/water/CanHeal(datum/disease/advance/A)
-	. = 0
-	var/mob/living/M = A.affected_mob
-	if(M.fire_stacks < 0)
-		M.fire_stacks = min(M.fire_stacks + 1 * absorption_coeff, 0)
-		. += power
-	if(M.reagents.has_reagent("holywater"))
-		M.reagents.remove_reagent("holywater", 0.5 * absorption_coeff)
-		. += power * 0.75
-	else if(M.reagents.has_reagent("water"))
-		M.reagents.remove_reagent("water", 0.5 * absorption_coeff)
-		. += power * 0.5
-
-/datum/symptom/heal/water/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
-	var/heal_amt = 2 * actual_power
-
-	var/list/parts = M.get_damaged_bodyparts(1,1) //more effective on burns
-
-	if(!parts.len)
-		return
-
-	if(prob(5))
-		to_chat(M, "<span class='notice'>You feel yourself absorbing the water around you to soothe your damaged skin.</span>")
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len * 0.5, heal_amt/parts.len))
-			M.update_damage_overlays()
-
-	return 1
-
-/datum/symptom/heal/water/passive_message_condition(mob/living/M)
-	if(M.getBruteLoss() || M.getFireLoss())
-		return TRUE
-	return FALSE
-
-/datum/symptom/heal/plasma
-	name = "Plasma Fixation"
-	desc = "The virus draws plasma from the atmosphere and from inside the body to heal and stabilize body temperature."
-	stealth = 0
-	resistance = 3
-	stage_speed = -2
-	transmittable = -2
-	level = 8
-	passive_message = "<span class='notice'>You feel an odd attraction to plasma.</span>"
-	var/temp_rate = 1
-	threshold_desc = "<b>Transmission 6:</b> Increases temperature adjustment rate.<br>\
-					  <b>Stage Speed 7:</b> Increases healing speed."
-
-/datum/symptom/heal/plasma/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["stage_rate"] >= 7)
-		power = 2
-	if(A.properties["transmittable"] >= 6)
-		temp_rate = 4
-
-/datum/symptom/heal/plasma/CanHeal(datum/disease/advance/A)
-	var/mob/living/M = A.affected_mob
-	var/datum/gas_mixture/environment
-	var/plasmamount
-
-	. = 0
-
-	if(M.loc)
-		environment = M.loc.return_air()
-	if(environment)
-		plasmamount = environment.gases[/datum/gas/plasma]
-		if(plasmamount && plasmamount > GLOB.meta_gas_visibility[/datum/gas/plasma]) //if there's enough plasma in the air to see
-			. += power * 0.5
-	if(M.reagents.has_reagent("plasma"))
-		. +=  power * 0.75
-
-/datum/symptom/heal/plasma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
-	var/heal_amt = 4 * actual_power
-
-	if(prob(5))
-		to_chat(M, "<span class='notice'>You feel yourself absorbing plasma inside and around you...</span>")
-
-	if(M.bodytemperature > BODYTEMP_NORMAL)
-		M.adjust_bodytemperature(-20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT,BODYTEMP_NORMAL)
-		if(prob(5))
-			to_chat(M, "<span class='notice'>You feel less hot.</span>")
-	else if(M.bodytemperature < (BODYTEMP_NORMAL + 1))
-		M.adjust_bodytemperature(20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT,0,BODYTEMP_NORMAL)
-		if(prob(5))
-			to_chat(M, "<span class='notice'>You feel warmer.</span>")
-
-	M.adjustToxLoss(-heal_amt)
-
-	var/list/parts = M.get_damaged_bodyparts(1,1)
-	if(!parts.len)
-		return
-	if(prob(5))
-		to_chat(M, "<span class='notice'>The pain from your wounds fades rapidly.</span>")
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len))
-			M.update_damage_overlays()
-	return 1
-
-
-/datum/symptom/heal/radiation
-	name = "Radioactive Resonance"
-	desc = "The virus uses radiation to fix damage through dna mutations."
-	stealth = -1
-	resistance = -2
-	stage_speed = 2
-	transmittable = -3
-	level = 6
-	symptom_delay_min = 1
-	symptom_delay_max = 1
-	passive_message = "<span class='notice'>Your skin glows faintly for a moment.</span>"
-	var/cellular_damage = FALSE
-	threshold_desc = "<b>Transmission 6:</b> Additionally heals cellular damage.<br>\
-					  <b>Resistance 7:</b> Increases healing speed."
-
-/datum/symptom/heal/radiation/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["resistance"] >= 7)
-		power = 2
-	if(A.properties["transmittable"] >= 6)
-		cellular_damage = TRUE
-
-/datum/symptom/heal/radiation/CanHeal(datum/disease/advance/A)
-	var/mob/living/M = A.affected_mob
-	switch(M.radiation)
-		if(0)
-			return FALSE
-		if(1 to RAD_MOB_SAFE)
-			return 0.25
-		if(RAD_MOB_SAFE to RAD_BURN_THRESHOLD)
-			return 0.5
-		if(RAD_BURN_THRESHOLD to RAD_MOB_MUTATE)
-			return 0.75
-		if(RAD_MOB_MUTATE to RAD_MOB_KNOCKDOWN)
-			return 1
-		else
-			return 1.5
-
-/datum/symptom/heal/radiation/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
-	var/heal_amt = actual_power
-
-	if(cellular_damage)
-		M.adjustCloneLoss(-heal_amt * 0.5)
-
-	M.adjustToxLoss(-(2 * heal_amt))
-
-	var/list/parts = M.get_damaged_bodyparts(1,1)
-
-	if(!parts.len)
-		return
-
-	if(prob(4))
-		to_chat(M, "<span class='notice'>Your skin glows faintly, and you feel your wounds mending themselves.</span>")
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len))
-			M.update_damage_overlays()
-	return 1
+/datum/symptom/heal
+	name = "Basic Healing (does nothing)" //warning for adminspawn viruses
+	desc = "You should not be seeing this."
+	stealth = 0
+	resistance = 0
+	stage_speed = 0
+	transmittable = 0
+	level = -1 //not obtainable
+	base_message_chance = 20 //here used for the overlays
+	symptom_delay_min = 1
+	symptom_delay_max = 1
+	var/passive_message = "" //random message to infected but not actively healing people
+	threshold_desc = "<b>Stage Speed 6:</b> Doubles healing speed.<br>\
+					  <b>Stealth 4:</b> Healing will no longer be visible to onlookers."
+
+/datum/symptom/heal/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["stage_rate"] >= 6) //stronger healing
+		power = 2
+
+/datum/symptom/heal/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/M = A.affected_mob
+	switch(A.stage)
+		if(4, 5)
+			var/effectiveness = CanHeal(A)
+			if(!effectiveness)
+				if(passive_message && prob(2) && passive_message_condition(M))
+					to_chat(M, passive_message)
+				return
+			else
+				Heal(M, A, effectiveness)
+	return
+
+/datum/symptom/heal/proc/CanHeal(datum/disease/advance/A)
+	return power
+
+/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A, actual_power)
+	return TRUE
+
+/datum/symptom/heal/proc/passive_message_condition(mob/living/M)
+	return TRUE
+
+/datum/symptom/heal/chem
+	name = "Toxolysis"
+	stealth = 0
+	resistance = -2
+	stage_speed = 2
+	transmittable = -2
+	level = 7
+	var/food_conversion = FALSE
+	desc = "The virus rapidly breaks down any foreign chemicals in the bloodstream."
+	threshold_desc = "<b>Resistance 7:</b> Increases chem removal speed.<br>\
+					  <b>Stage Speed 6:</b> Consumed chemicals nourish the host."
+
+/datum/symptom/heal/chem/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["stage_rate"] >= 6)
+		food_conversion = TRUE
+	if(A.properties["resistance"] >= 7)
+		power = 2
+
+/datum/symptom/heal/chem/Heal(mob/living/M, datum/disease/advance/A, actual_power)
+	for(var/datum/reagent/R in M.reagents.reagent_list) //Not just toxins!
+		M.reagents.remove_reagent(R.id, actual_power)
+		if(food_conversion)
+			M.nutrition += 0.3
+		if(prob(2))
+			to_chat(M, "<span class='notice'>You feel a mild warmth as your blood purifies itself.</span>")
+	return 1
+
+
+/datum/symptom/heal/coma
+	name = "Regenerative Coma"
+	desc = "The virus causes the host to fall into a death-like coma when severely damaged, then rapidly fixes the damage."
+	stealth = 0
+	resistance = 2
+	stage_speed = -3
+	transmittable = -2
+	level = 8
+	passive_message = "<span class='notice'>The pain from your wounds makes you feel oddly sleepy...</span>"
+	var/deathgasp = FALSE
+	var/active_coma = FALSE //to prevent multiple coma procs
+	threshold_desc = "<b>Stealth 2:</b> Host appears to die when falling into a coma.<br>\
+					  <b>Stage Speed 7:</b> Increases healing speed."
+
+/datum/symptom/heal/coma/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["stage_rate"] >= 7)
+		power = 1.5
+	if(A.properties["stealth"] >= 2)
+		deathgasp = TRUE
+
+/datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
+	var/mob/living/M = A.affected_mob
+	if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
+		return power
+	else if(M.IsUnconscious() || M.stat == UNCONSCIOUS)
+		return power * 0.9
+	else if(M.stat == SOFT_CRIT)
+		return power * 0.5
+	else if(M.IsSleeping())
+		return power * 0.25
+	else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
+		to_chat(M, "<span class='warning'>You feel yourself slip into a regenerative coma...</span>")
+		active_coma = TRUE
+		addtimer(CALLBACK(src, .proc/coma, M), 60)
+
+/datum/symptom/heal/coma/proc/coma(mob/living/M)
+	if(deathgasp)
+		M.emote("deathgasp")
+	M.fakedeath("regenerative_coma")
+	M.update_stat()
+	M.update_canmove()
+	addtimer(CALLBACK(src, .proc/uncoma, M), 300)
+
+/datum/symptom/heal/coma/proc/uncoma(mob/living/M)
+	if(!active_coma)
+		return
+	active_coma = FALSE
+	M.cure_fakedeath("regenerative_coma")
+	M.update_stat()
+	M.update_canmove()
+
+/datum/symptom/heal/coma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+	var/heal_amt = 4 * actual_power
+
+	var/list/parts = M.get_damaged_bodyparts(1,1)
+
+	if(!parts.len)
+		return
+
+	for(var/obj/item/bodypart/L in parts)
+		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len))
+			M.update_damage_overlays()
+
+	if(active_coma && M.getBruteLoss() + M.getFireLoss() == 0)
+		uncoma(M)
+
+	return 1
+
+/datum/symptom/heal/coma/passive_message_condition(mob/living/M)
+	if((M.getBruteLoss() + M.getFireLoss()) > 30)
+		return TRUE
+	return FALSE
+
+/*
+//////////////////////////////////////
+im not even gonna bother with these for the following symptoms. typed em out, code was deleted, had to start over, read the symptoms yourself.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/EMP
+	name = "Organic Flux Induction"
+	desc = "Causes electromagnetic interference around the subject"
+	stealth = -2
+	resistance = -1
+	stage_speed = 0
+	transmittable = -2
+	level = 6
+	severity = 4
+	symptom_delay_min = 15
+	symptom_delay_max = 40
+	var/bigemp = FALSE
+	var/cellheal = FALSE
+	threshold_desc = "<b>Stealth 4:</b> The disease resets cell DNA, quickly curing cell damage and mutations<br>\
+					<b>transmission 8:</b> The EMP affects electronics adjacent to the subject as well."
+
+/datum/symptom/EMP/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["stealth"] >= 4)
+		cellheal = TRUE
+	if(A.properties["transmittable"] >= 8)
+		bigemp = TRUE
+
+/datum/symptom/EMP/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/carbon/M = A.affected_mob
+	switch(A.stage)
+		if(4, 5)
+			M.emp_act(EMP_HEAVY)
+			if(cellheal)
+				M.adjustCloneLoss(-40)
+				M.reagents.add_reagent(/datum/reagent/medicine/mutadone = 1)
+			if(bigemp)
+				empulse(M.loc, 0, 1)
+			to_chat(M, "<span class='userdanger'>[pick("Your mind fills with static!.", "You feel a jolt!", "Your sense of direction flickers out!")]</span>")
+		else
+			to_chat(M, "<span class='notice'>[pick("You feel a slight tug toward the station's wall.", "Nearby electronics flicker", "Your hair stands on end")]</span>")
+	return
+
+/datum/symptom/sweat
+	name = "Hyperperspiration"
+	desc = "Causes the host to sweat profusely, leaving small water puddles and extnguishing small fires"
+	stealth = 1
+	resistance = -1
+	stage_speed = 0
+	transmittable = 1
+	level = 6
+	severity = 4
+	symptom_delay_min = 10
+	symptom_delay_max = 30
+	var/bigsweat = FALSE
+	var/toxheal = FALSE
+	threshold_desc = "<b>transmission 6:</b> The sweat production ramps up to the point that it cleans messes and puts out fires in the general vicinity<br>\
+					<b>transmission 8:</b> The EMP affects electronics adjacent to the subject as well."
+
+/datum/symptom/sweat/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["transmittable"] >= 8)
+		toxheal = TRUE
+	if(A.properties["transmittable"] >= 6)
+		bigsweat = TRUE
+
+/datum/symptom/sweat/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/carbon/M = A.affected_mob
+	switch(A.stage)
+		if(4, 5)
+			M.adjust_fire_stacks(-5)
+			if(prob(30))
+				var/turf/open/OT = get_turf(M)
+				if(istype(OT))
+					to_chat(M, "<span class='danger'>The sweat pools into a puddle!</span>")
+					OT.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
+			if(bigsweat)
+				var/obj/effect/sweatsplash/S = new(M.loc)
+				if(toxheal)
+					for(var/datum/reagent/R in M.reagents.reagent_list) //Not just toxins!
+						M.reagents.remove_reagent(R.type, 5)
+						S.reagents.add_reagent(R.type, 5)
+					M.adjustToxLoss(-20, forced = TRUE)
+				S.splash()
+				to_chat(M, "<span class='userdanger'>You sweat out nearly everything in your body!</span>")
+		else
+			to_chat(M, "<span class='notice'>[pick("You feel moist.", "Your clothes are soaked", "You're sweating buckets")]</span>")
+	return
+
+/obj/effect/sweatsplash
+	name = "Sweatsplash"
+
+/obj/effect/sweatsplash/Initialize()
+	create_reagents(1000)
+	reagents.add_reagent(/datum/reagent/water, 10)
+	reagents.add_reagent(/datum/reagent/space_cleaner, 10)
+
+obj/effect/sweatsplash/proc/splash()
+	chem_splash(loc, 2, list(reagents))
+	qdel(src)
+
+/datum/symptom/teleport
+	name = "Thermal Retrostable Displacement"
+	desc = "When too hot or cold, the subject will return to a recent location they experienced safe homeostasis"
+	stealth = 1
+	resistance = 2
+	stage_speed = -2
+	transmittable = -3
+	level = 8
+	severity = 0
+	symptom_delay_min = 1
+	symptom_delay_max = 1
+	var/telethreshold = 0
+	var/burnheal = FALSE
+	var/turf/open/location_return = null
+	var/cooldowntimer = 0
+	threshold_desc = "<b>Resistance 8:</b> The disease acts on a smaller scale, resetting burnt tissue back to a state of health<br>\
+					<b>Transmission 8:</b> The disease becomes more active, activating in a smaller temperature range."
+
+/datum/symptom/teleport/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["resistance"] >= 8)
+		burnheal = TRUE
+	if(A.properties["transmittable"] >= 8)
+		telethreshold = 25
+		power = 2
+
+/datum/symptom/teleport/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/carbon/M = A.affected_mob
+	switch(A.stage)
+		if(4, 5)
+			if(burnheal)
+				M.adjustFireLoss(-1 * power)
+			if(prob(5) && (M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT || M.bodytemperature > BODYTEMP_COLD_DAMAGE_LIMIT))
+				location_return = get_turf(M)	//sets up return point
+				if(prob(50))
+					to_chat(M, "<span class='userwarning'>The lukewarm temperature makes you feel strange!</span>")
+			if(cooldowntimer == 0 && (M.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT - telethreshold || M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT + telethreshold || (burnheal && M.getFireLoss() > 75 - telethreshold)))
+				do_sparks(5,FALSE,M)
+				to_chat(M, "<span class='userdanger'>The change in temperature shocks you back to a previous spacial state!</span>")
+				do_teleport(M, location_return, 0, asoundin = 'sound/effects/phasein.ogg') //Teleports home
+				do_sparks(5,FALSE,M)
+				cooldowntimer = 10
+				if(burnheal)
+					M.adjust_fire_stacks(-10)
+			if(cooldowntimer > 0)
+				cooldowntimer --
+		else
+			if(prob(7))
+				to_chat(M, "<span class='notice'>[pick("Your warm breath fizzles out of existence.", "You feel attracted to temperate climates", "You feel like you're forgetting something")]</span>")
+	return
+
+/datum/symptom/growth
+	name = "Pituitary Disruption"
+	desc = "Causes uncontrolled growth in the subject"
+	stealth = -3
+	resistance = -2
+	stage_speed = 1
+	transmittable = -2
+	level = 7
+	severity = 4
+	symptom_delay_min = 1
+	symptom_delay_max = 1
+	var/current_size = 1
+	var/tetsuo = FALSE
+	var/bruteheal = FALSE
+	threshold_desc = "<b>Stage Speed 8:</b> The disease heals brute damage at a fast rate, but causes expulsion of benign tumors<br>\
+					<b>Stage Speed 12:</b> The disease heals brute damage incredibly fast, but deteriorates cell health and causes tumors to become more advanced."
+
+/datum/symptom/growth/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["stage_rate"] >= 8)
+		bruteheal = TRUE
+	if(A.properties["stage_rate"] >= 12)
+		tetsuo = TRUE
+
+/datum/symptom/growth/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/carbon/M = A.affected_mob
+	var/newsize = current_size
+	switch(A.stage)
+		if(4, 5)
+			switch(A.properties["stage_rate"])
+				if(5 to 8)
+					newsize = 1.25
+				if(9 to 12)
+					newsize = 1.5
+				if(13 to 16)
+					newsize = 1.75
+				if(17 to INFINITY)
+					newsize = 2
+			M.resize = newsize/current_size
+			current_size = newsize
+			M.update_transform()
+			if(prob(5) && bruteheal)
+				to_chat(M, "<span class='userdanger'>You retch, and a splatter of gore escapes your gullet</span>")
+				M.Knockdown(40)
+				new /obj/effect/gibspawner/generic(M.loc)
+				if(prob(80))
+					new /obj/effect/spawner/lootdrop/teratoma/minor(M.loc)
+				if(tetsuo && prob(30))
+					new /obj/effect/spawner/lootdrop/teratoma/major(M.loc)
+				if(tetsuo && prob(10) && A.affected_mob.job == "Clown")
+					new /obj/effect/spawner/lootdrop/teratoma/major/clown(M.loc)
+			if(tetsuo)
+				M.adjustBruteLoss(-5)
+				if(prob(20))
+					M.adjustCloneLoss(1)
+			else if(bruteheal)
+				M.adjustBruteLoss(-1)
+		else
+			if(prob(5))
+				to_chat(M, "<span class='notice'>[pick("You feel bloated.", "The station seems small", "You are the strongest")]</span>")
+	return
+
+/obj/effect/mob_spawn/teratomamonkey //spawning these is one of the downsides of overclocking the symptom
+	name = "fleshy mass"
+	desc = "A writhing mass of flesh."
+	icon = 'icons/mob/blob.dmi'
+	icon_state = "blob_spore_temp"
+	density = FALSE
+	anchored = FALSE
+
+	mob_type = /mob/living/carbon/monkey/tumor
+	mob_name = "a living tumor"
+	death = FALSE
+	roundstart = FALSE
+	flavour_text = {"
+	<b>You are a living teratoma, and your existence is misery. You feel the need to spread woe about the station- but not to kill.
+	"}
+
+/obj/effect/mob_spawn/teratomamonkey/Initialize()
+	. = ..()
+	var/area/A = get_area(src)
+	if(A)
+		notify_ghosts("A living tumor has been born in [A.name].", 'sound/effects/splat.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
+
+/obj/effect/mob_spawn/teratomamonkey/attack_hand(mob/living/user)
+	. = ..()
+	if(.)
+		return
+	to_chat(user, "<span class='notice'>Ew... It would be a bad idea to touch this. It could probably be destroyed with the extreme heat of a welder.</span>")
+
+/obj/effect/mob_spawn/teratomamonkey/attackby(obj/item/W, mob/user, params)
+	if(W.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM)
+		user.visible_message("<span class='warning'>[usr.name] destroys [src].</span>",
+			"<span class='notice'>You hold the welder to [src], and it violently bursts!</span>",
+			"<span class='italics'>You hear a gurgling noise</span>")
+		new /obj/effect/gibspawner/human(get_turf(src))
+		qdel(src)
+	else
+		..()
\ No newline at end of file
diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm
index a60011d3..778909ed 100644
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -1,52 +1,66 @@
-/*
-//////////////////////////////////////
-
-Self-Respiration
-
-	Slightly hidden.
-	Lowers resistance significantly.
-	Decreases stage speed significantly.
-	Decreases transmittablity tremendously.
-	Fatal Level.
-
-Bonus
-	The body generates salbutamol.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/oxygen
-
-	name = "Self-Respiration"
-	desc = "The virus rapidly synthesizes oxygen, effectively removing the need for breathing."
-	stealth = 1
-	resistance = -3
-	stage_speed = -3
-	transmittable = -4
-	level = 6
-	base_message_chance = 5
-	symptom_delay_min = 1
-	symptom_delay_max = 1
-	var/regenerate_blood = FALSE
-	threshold_desc = "<b>Resistance 8:</b>Additionally regenerates lost blood.<br>"
-
-/datum/symptom/oxygen/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	if(A.properties["resistance"] >= 8) //blood regeneration
-		regenerate_blood = TRUE
-
-/datum/symptom/oxygen/Activate(datum/disease/advance/A)
-	if(!..())
-		return
-	var/mob/living/carbon/M = A.affected_mob
-	switch(A.stage)
-		if(4, 5)
-			M.adjustOxyLoss(-7, 0)
-			M.losebreath = max(0, M.losebreath - 4)
-			if(regenerate_blood && M.blood_volume < (BLOOD_VOLUME_NORMAL * M.blood_ratio))
-				M.blood_volume += 1
-		else
-			if(prob(base_message_chance))
-				to_chat(M, "<span class='notice'>[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]</span>")
-	return
+/*
+//////////////////////////////////////
+
+Self-Respiration
+
+	Slightly hidden.
+	Lowers resistance significantly.
+	Decreases stage speed significantly.
+	Decreases transmittablity tremendously.
+	Fatal Level.
+
+Bonus
+	The body generates salbutamol.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/oxygen
+
+	name = "Self-Respiration"
+	desc = "The virus rapidly synthesizes oxygen, effectively removing the need for breathing."
+	stealth = 1
+	resistance = -3
+	stage_speed = -3
+	transmittable = -4
+	level = 6
+	base_message_chance = 5
+	symptom_delay_min = 1
+	symptom_delay_max = 1
+	var/regenerate_blood = FALSE
+	threshold_desc = "<b>Resistance 8:</b> Additionally regenerates lost blood.<br>"
+
+/datum/symptom/oxygen/Start(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.properties["resistance"] >= 8) //blood regeneration
+		regenerate_blood = TRUE
+
+/datum/symptom/oxygen/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/carbon/M = A.affected_mob
+	switch(A.stage)
+		if(4, 5)
+			ADD_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
+			M.adjustOxyLoss(-7, 0)
+			M.losebreath = max(0, M.losebreath - 4)
+			if(regenerate_blood && M.blood_volume < BLOOD_VOLUME_NORMAL)
+				M.blood_volume += 1
+		else
+			if(prob(base_message_chance))
+				to_chat(M, "<span class='notice'>[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]</span>")
+	return
+
+/datum/symptom/oxygen/on_stage_change(new_stage, datum/disease/advance/A)
+	if(!..())
+		return FALSE
+	var/mob/living/carbon/M = A.affected_mob
+	if(A.stage <= 3)
+		REMOVE_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
+	return TRUE
+
+/datum/symptom/oxygen/End(datum/disease/advance/A)
+	if(!..())
+		return
+	REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm
index 2d8ec91f..7cc84ae7 100644
--- a/code/datums/diseases/advance/symptoms/skin.dm
+++ b/code/datums/diseases/advance/symptoms/skin.dm
@@ -86,3 +86,46 @@ BONUS
 				H.update_body(0)
 			else
 				H.visible_message("<span class='warning'>[H] looks a bit dark...</span>", "<span class='notice'>Your skin suddenly appears darker...</span>")
+
+/*
+//////////////////////////////////////
+Polyvitiligo
+
+	Not Noticeable.
+	Increases resistance slightly.
+	Increases stage speed.
+	Transmittable.
+	Low Level.
+
+BONUS
+	Makes the host change color
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/polyvitiligo
+	name = "Polyvitiligo"
+	desc = "The virus replaces the melanin in the skin with reactive pigment."
+	stealth = 0
+	resistance = 1
+	stage_speed = 2
+	transmittable = 2
+	level = 4
+	severity = 1
+	base_message_chance = 50
+	symptom_delay_min = 45
+	symptom_delay_max = 90
+
+/datum/symptom/polyvitiligo/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/M = A.affected_mob
+	switch(A.stage)
+		if(5)
+			var/static/list/banned_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/invisible, /datum/reagent/colorful_reagent/crayonpowder/white)
+			var/color = pick(subtypesof(/datum/reagent/colorful_reagent/crayonpowder) - banned_reagents)
+			if(M.reagents.total_volume <= (M.reagents.maximum_volume/10)) // no flooding humans with 1000 units of colorful reagent
+				M.reagents.add_reagent(color, 5)
+		else
+			if (prob(50)) // spam
+				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")
\ No newline at end of file
diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm
index 4b040786..4c858172 100644
--- a/code/datums/diseases/advance/symptoms/sneeze.dm
+++ b/code/datums/diseases/advance/symptoms/sneeze.dm
@@ -26,8 +26,7 @@ Bonus
 	severity = 1
 	symptom_delay_min = 5
 	symptom_delay_max = 35
-	threshold_desc = "<b>Transmission 9:</b> The host will sneeze periodically, spreading the disease. <br>\
-					  <b>Stealth 4:</b> The symptom remains hidden until active."
+	threshold_desc = "<b>Stealth 4:</b> The symptom remains hidden until active."
 
 /datum/symptom/sneeze/Start(datum/disease/advance/A)
 	if(!..())
@@ -38,8 +37,6 @@ Bonus
 /datum/symptom/sneeze/Activate(datum/disease/advance/A)
 	if(!..())
 		return
-	if(!A.properties["transmittable"] >= 9)
-		return
 	var/mob/living/M = A.affected_mob
 	switch(A.stage)
 		if(1, 2, 3)
@@ -47,4 +44,3 @@ Bonus
 				M.emote("sniff")
 		else
 			M.emote("sneeze")
-			A.spread(4 + power)
diff --git a/code/datums/diseases/advance/symptoms/species.dm b/code/datums/diseases/advance/symptoms/species.dm
index d0c32f32..a8b18ae7 100644
--- a/code/datums/diseases/advance/symptoms/species.dm
+++ b/code/datums/diseases/advance/symptoms/species.dm
@@ -8,12 +8,14 @@
 	level = 5
 	severity = 0
 
-/datum/symptom/undead_adaptation/Start(datum/disease/advance/A)
-	if(!..())
-		return
+/datum/symptom/undead_adaptation/OnAdd(datum/disease/advance/A)
 	A.process_dead = TRUE
 	A.infectable_biotypes |= MOB_UNDEAD
 
+/datum/symptom/undead_adaptation/OnRemove(datum/disease/advance/A)
+	A.process_dead = FALSE
+	A.infectable_biotypes -= MOB_UNDEAD
+
 /datum/symptom/inorganic_adaptation
 	name = "Inorganic Biology"
 	desc = "The virus can survive and replicate even in an inorganic environment, increasing its resistance and infection rate."
@@ -24,7 +26,8 @@
 	level = 5
 	severity = 0
 
-/datum/symptom/inorganic_adaptation/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	A.infectable_biotypes |= MOB_INORGANIC
\ No newline at end of file
+/datum/symptom/inorganic_adaptation/OnAdd(datum/disease/advance/A)
+	A.infectable_biotypes |= MOB_INORGANIC
+
+/datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A)
+	A.infectable_biotypes -= MOB_INORGANIC
\ No newline at end of file
diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm
index 95831b36..33f5ca4d 100644
--- a/code/datums/diseases/advance/symptoms/symptoms.dm
+++ b/code/datums/diseases/advance/symptoms/symptoms.dm
@@ -60,15 +60,26 @@
 		next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10)
 		return TRUE
 
+/datum/symptom/proc/on_stage_change(new_stage, datum/disease/advance/A)
+	if(neutered)
+		return FALSE
+	return TRUE
+
 /datum/symptom/proc/Copy()
 	var/datum/symptom/new_symp = new type
 	new_symp.name = name
 	new_symp.id = id
 	new_symp.neutered = neutered
 	return new_symp
-	
+
 /datum/symptom/proc/OnDeath(datum/disease/advance/A)
 	return !neutered
 
 /datum/symptom/proc/generate_threshold_desc()
 	return
+
+/datum/symptom/proc/OnAdd(datum/disease/advance/A)		//Overload when a symptom needs to be active before processing, like changing biotypes.
+	return
+
+/datum/symptom/proc/OnRemove(datum/disease/advance/A)	//But dont forget to remove them too.
+	return
diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm
index b4a33cb8..940e1af7 100644
--- a/code/datums/diseases/advance/symptoms/vision.dm
+++ b/code/datums/diseases/advance/symptoms/vision.dm
@@ -20,9 +20,9 @@ Bonus
 	name = "Hyphema"
 	desc = "The virus causes inflammation of the retina, leading to eye damage and eventually blindness."
 	stealth = -1
-	resistance = -4
+	resistance = -3
 	stage_speed = -4
-	transmittable = -3
+	transmittable = -2
 	level = 5
 	severity = 5
 	base_message_chance = 50
diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm
index f53638bc..8c57fc82 100644
--- a/code/datums/diseases/advance/symptoms/vomit.dm
+++ b/code/datums/diseases/advance/symptoms/vomit.dm
@@ -24,9 +24,9 @@ Bonus
 	name = "Vomiting"
 	desc = "The virus causes nausea and irritates the stomach, causing occasional vomit."
 	stealth = -2
-	resistance = -1
+	resistance = 1
 	stage_speed = 0
-	transmittable = 1
+	transmittable = 2
 	level = 3
 	severity = 3
 	base_message_chance = 100
@@ -60,4 +60,4 @@ Bonus
 			vomit(M)
 
 /datum/symptom/vomit/proc/vomit(mob/living/carbon/M)
-	M.vomit(20, vomit_blood, distance = proj_vomit)
+	M.vomit(20, vomit_blood, stun = 0, distance = proj_vomit)
diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm
index 66fc90f1..a1129561 100644
--- a/code/datums/diseases/advance/symptoms/weight.dm
+++ b/code/datums/diseases/advance/symptoms/weight.dm
@@ -23,18 +23,18 @@ Bonus
 	stealth = -2
 	resistance = 2
 	stage_speed = -2
-	transmittable = -2
+	transmittable = -1
 	level = 3
 	severity = 3
 	base_message_chance = 100
 	symptom_delay_min = 15
 	symptom_delay_max = 45
-	threshold_desc = "<b>Stealth 4:</b> The symptom is less noticeable."
+	threshold_desc = "<b>Stealth 2:</b> The symptom is less noticeable."
 
 /datum/symptom/weight_loss/Start(datum/disease/advance/A)
 	if(!..())
 		return
-	if(A.properties["stealth"] >= 4) //warn less often
+	if(A.properties["stealth"] >= 2) //warn less often
 		base_message_chance = 25
 
 /datum/symptom/weight_loss/Activate(datum/disease/advance/A)

From b89f4bf1f19a935c37cd0160636650a2df828a6c Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 11:16:57 -0800
Subject: [PATCH 03/21] Add files via upload

---
 code/datums/diseases/advance/symptoms/narcolepsy.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/narcolepsy.dm b/code/datums/diseases/advance/symptoms/narcolepsy.dm
index 24ba024a..89d1d6d6 100644
--- a/code/datums/diseases/advance/symptoms/narcolepsy.dm
+++ b/code/datums/diseases/advance/symptoms/narcolepsy.dm
@@ -15,13 +15,13 @@ Bonus
 /datum/symptom/narcolepsy
 	name = "Narcolepsy"
 	desc = "The virus causes a hormone imbalance, making the host sleepy and narcoleptic."
-	stealth = -1
+	stealth = 1
 	resistance = -2
 	stage_speed = -3
-	transmittable = -4
+	transmittable = -2
 	level = 6
-	symptom_delay_min = 15
-	symptom_delay_max = 80
+	symptom_delay_min = 10
+	symptom_delay_max = 30
 	severity = 4
 	var/sleep_level = 0
 	var/sleepy_ticks = 0
@@ -35,8 +35,8 @@ Bonus
 	if(A.properties["transmittable"] >= 7) //stamina damage
 		stamina = TRUE
 	if(A.properties["resistance"] >= 10) //act more often
-		symptom_delay_min = 10
-		symptom_delay_max = 60
+		symptom_delay_min = 5
+		symptom_delay_max = 20
 
 /datum/symptom/narcolepsy/Activate(var/datum/disease/advance/A)
 	var/mob/living/M = A.affected_mob

From 393b64318b3f091817a268f47bb1c9e061137768 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 11:17:47 -0800
Subject: [PATCH 04/21] tumormonky

---
 icons/mob/monkey.dmi | Bin 1287 -> 2204 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/mob/monkey.dmi b/icons/mob/monkey.dmi
index 77a21eed4263f5525565872458e992d441cff9da..8c25a3dc8116e9c79fdabad2ba800971f211b616 100644
GIT binary patch
delta 2055
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

delta 1130
zcmV-w1eN=o5r+yTiBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3IG5ASCJ(v
zMF3*N0A~LHJ$Z|ZivVTHYHDhL5^Rxp0IL|0!k_@(AgKTD0BR3fd1L^v8I{SV0C%I%
z9RL6T0d!JMQvg8b*k%9#0FsgWhJS?D0m=%lelFku0|5QcS^D`rXN>>=1Hef{K~!jg
z?O6?zqA(1lcB#OEh@iWE{Quv1FDZx%P0GmK%-#&a?K-?PucfKJ*d*EPcbOqufhRh?
zGj_MzS+kRIG7;|s$P9o#a9PR2$G0L*0nlF~NHKs^CU6|zDFhrqVQ^`h%76VmgM#}2
z8i8@nDXSF2*+J{?yvdJ9$GwNP1jfPvZP+J<vj^cC0Vjz<py7jul7x6UZbLqF+b^;d
zgCoc@Fx-_K!ahB2C4BG@SJ_~Bcn$X^xKOyeXFLhx?BSF&vuT>`$+9%HZ{Y0FI|#7t
z16YAT$JxWjpTP87`G4X}o`2`YB|?9~izhyGdwFLI^v^$M@%>+)1!9hPyeJBfkKM+1
zMM3>%1G5+rHGP7sX-+M1JbS$aD17{RZ|jF(lZ6CmpIu%96pSg~I7kAXh>|2K?p;zT
z1;!CQM>cnO{U?O5V)xB9+ibI6V{7Y!X#7}xpyG=NK6YAtpw|xz;(tf#gGl|bgdkQQ
z==cH#UEh~1&&w4Ay1*~15-{2o@lgPXs-isLa@?*UP~?AImsLftx?VxxL}>>M(T^Zd
ziWqCvooJ}SkmNsRR#r{cRAq3EELNb45TO<yq4D}Yyv(=_f)f#h9BgV37_D(NEs_ar
z_+I}D$_=9{n?rtR%735(1YKQ~z0oW~BGoep+7GvT0-=5|AZVHjcEBWqA1U^e^nLME
zkU!tpq(p$GEW`B!ZejojqQG`Zg&!>_NsGdV9Tx5>|2a#k3B@O?nmj*cN7|05@Ux5Y
z48@E7AM1yjH$Xkx2Eznxd<OJ=LXWO^)&H^jVQ^cr1}O`C;eP>0^+7*@1z8l4_hS9v
z>#qg-;BE8IFNyEuzd^N96>PTIX8(b$K0nZH!TG_u`XGLOu(Cdgo*%5Q52EJ>E9--n
z)q5-A9pl~m@y{&+pq1iZI^byEjsJzqaT|{RjmvTS9>Mk6p3n5UUW54U)?F_2y4}PW
z+E*s@KcXK&Ab<Y6kLX7b1o0R7E>J*FwdZ?wKeyo;2Y0*6BYRxBaD9-{*wH$F2r`!~
zQ2ih{5rK4m0D=<{gzE!3-N-WjI6<j87hafNd;iM6?yY!!&^^BM??)%#q&oL|=g;yW
zPG=G`wLO7&e$W#LI3}5U0{2t=j{3iC@ArG#CR6P>;B#H~cs#mJIA4GV6FB=*zK{B!
zvy_@i`~l}IrDhs;kncPLH=V(#|F66Ou9Iyr;y2y^x9K)`%6DlE;`)C{eK2IvUd*ER
w&kqLq9@z)c^8*>5$oGG#uQ&O=*?(z&0P1`yJ(y40-~a#s07*qoM6N<$g4W*^-T(jq


From 358665713f48bc6a9523a8d8d10b32ab15f26f26 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 11:26:22 -0800
Subject: [PATCH 05/21] teratoma drops

---
 .../game/objects/effects/spawners/lootdrop.dm | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index b78a2192..5466d9ff 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -172,6 +172,53 @@
 		/obj/item/organ/body_egg/alien_embryo = 1,
 		/obj/item/organ/regenerative_core = 2)
 	lootcount = 3
+/obj/effect/spawner/lootdrop/teratoma/minor
+	name = "teratoma spawner"
+	loot = list(
+		/obj/item/organ/tongue = 5,
+		/obj/item/organ/tongue/lizard = 1,
+		/obj/item/organ/tail/cat = 1,
+		/obj/item/organ/stomach = 5,
+		/obj/item/organ/tongue/zombie = 1,
+		/obj/item/organ/tongue/fly = 1,
+		/obj/item/organ/stomach/fly = 1,
+		/obj/item/organ/ears = 5,
+		/obj/item/organ/ears/cat = 1,
+		/obj/item/organ/eyes = 5,
+		/obj/item/organ/heart = 5,
+		/obj/item/organ/liver = 5,
+		/obj/item/organ/tail/lizard = 1,
+		/obj/item/organ/appendix = 5,
+		/obj/effect/gibspawner/human = 1)
+
+/obj/effect/spawner/lootdrop/teratoma/major
+	name = "advanced teratoma spawner"
+	loot = list(
+		/obj/item/organ/adamantine_resonator = 2,
+		/obj/item/organ/heart/gland/viral = 1,
+		/obj/item/organ/eyes/night_vision = 1,
+		/obj/item/organ/liver/plasmaman = 3,
+		/obj/item/organ/stomach/plasmaman = 3,
+		/obj/item/organ/lungs/plasmaman = 3,
+		/obj/item/organ/lungs/slime = 3,
+		/obj/item/organ/tongue/abductor = 1,
+		/obj/item/organ/tongue/bone = 3,
+		/obj/item/organ/tongue/bone/plasmaman = 1,
+		/obj/item/organ/vocal_cords/adamantine = 1,
+		/obj/effect/gibspawner/xeno = 1,
+		/obj/effect/mob_spawn/human/corpse/assistant = 1,
+		/obj/effect/mob_spawn/teratomamonkey = 5)
+
+/obj/effect/spawner/lootdrop/teratoma/major/clown
+	name = "funny teratoma spawner"
+	loot = list(
+		/mob/living/simple_animal/hostile/retaliate/frog = 1,
+		/mob/living/simple_animal/hostile/retaliate/clown = 1,
+		/mob/living/simple_animal/hostile/retaliate/spaceman = 1,
+		/obj/item/clothing/mask/gas/clown_hat = 4,
+		/obj/item/clothing/shoes/clown_shoes = 3,
+		/obj/item/bikehorn = 5,
+		/obj/item/reagent_containers/food/snacks/pie/cream = 3)
 
 /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner
 	name = "2% chance xeno egg spawner"

From c74d1b8f64c80228e72c9b1efdbe59d81b86e755 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 11:28:17 -0800
Subject: [PATCH 06/21] disease update

---
 .../antagonists/disease/disease_abilities.dm  | 281 ++++++++++--------
 1 file changed, 164 insertions(+), 117 deletions(-)

diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm
index 07cd3030..ccab2be3 100644
--- a/code/modules/antagonists/disease/disease_abilities.dm
+++ b/code/modules/antagonists/disease/disease_abilities.dm
@@ -5,26 +5,48 @@ is currently following.
 */
 
 GLOBAL_LIST_INIT(disease_ability_singletons, list(
-	new /datum/disease_ability/action/cough(),
-	new /datum/disease_ability/action/sneeze(),
-	new /datum/disease_ability/action/infect(),
-	new /datum/disease_ability/symptom/cough(),
-	new /datum/disease_ability/symptom/sneeze(),\
-	new /datum/disease_ability/symptom/hallucigen(),
-	new /datum/disease_ability/symptom/choking(),
-	new /datum/disease_ability/symptom/confusion(),
-	new /datum/disease_ability/symptom/youth(),
-	new /datum/disease_ability/symptom/vomit(),
-	new /datum/disease_ability/symptom/voice_change(),
-	new /datum/disease_ability/symptom/visionloss(),
-	new /datum/disease_ability/symptom/viraladaptation(),
-	new /datum/disease_ability/symptom/vitiligo(),
-	new /datum/disease_ability/symptom/sensory_restoration(),
-	new /datum/disease_ability/symptom/itching(),
-	new /datum/disease_ability/symptom/weight_loss(),
-	new /datum/disease_ability/symptom/metabolism_heal(),
-	new /datum/disease_ability/symptom/coma_heal()
-	))
+new /datum/disease_ability/action/cough,
+new /datum/disease_ability/action/sneeze,
+new /datum/disease_ability/action/infect,
+new /datum/disease_ability/symptom/mild/cough,
+new /datum/disease_ability/symptom/mild/sneeze,
+new /datum/disease_ability/symptom/medium/beard,
+new /datum/disease_ability/symptom/medium/hallucigen,
+new /datum/disease_ability/symptom/medium/confusion,
+new /datum/disease_ability/symptom/medium/vomit,
+new /datum/disease_ability/symptom/medium/voice_change,
+new /datum/disease_ability/symptom/medium/visionloss,
+new /datum/disease_ability/symptom/medium/deafness,
+new /datum/disease_ability/symptom/powerful/narcolepsy,
+new /datum/disease_ability/symptom/medium/fever,
+new /datum/disease_ability/symptom/medium/shivering,
+new /datum/disease_ability/symptom/medium/headache,
+new /datum/disease_ability/symptom/medium/nano_boost,
+new /datum/disease_ability/symptom/medium/nano_destroy,
+new /datum/disease_ability/symptom/medium/viraladaptation,
+new /datum/disease_ability/symptom/medium/viralevolution,
+new /datum/disease_ability/symptom/medium/vitiligo,
+new /datum/disease_ability/symptom/medium/revitiligo,
+new /datum/disease_ability/symptom/medium/itching,
+new /datum/disease_ability/symptom/medium/heal/weight_loss,
+new /datum/disease_ability/symptom/medium/heal/sensory_restoration,
+new /datum/disease_ability/symptom/medium/heal/mind_restoration,
+new /datum/disease_ability/symptom/powerful/fire,
+new /datum/disease_ability/symptom/powerful/flesh_eating,
+new /datum/disease_ability/symptom/powerful/genetic_mutation,
+new /datum/disease_ability/symptom/powerful/inorganic_adaptation,
+new /datum/disease_ability/symptom/powerful/heal/oxygen,
+new /datum/disease_ability/symptom/powerful/heal/chem,
+new /datum/disease_ability/symptom/powerful/heal/coma,
+new /datum/disease_ability/symptom/powerful/heal/teleport,
+new /datum/disease_ability/symptom/powerful/heal/growth,
+new /datum/disease_ability/symptom/powerful/heal/EMP,
+new /datum/disease_ability/symptom/powerful/heal/sweat,
+new /datum/disease_ability/symptom/powerful/wizarditis,
+new /datum/disease_ability/symptom/medium/pierrot,
+new /datum/disease_ability/symptom/medium/cockroach,
+new /datum/disease_ability/symptom/powerful/youth
+))
 
 /datum/disease_ability
 	var/name
@@ -234,155 +256,180 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 			O.AddComponent(/datum/component/infective, D.disease_template, 300)
 	StartCooldown()
 	return TRUE
+/*******************BASE SYMPTOM TYPES*******************/
+// cost is for convenience and can be changed. If you're changing req_tot_points then don't use the subtype...
+//healing no longer costs more, sans regen coma, due to how healing symptoms have been made scary
 
-//passive symptom abilities
-
-/datum/disease_ability/symptom/cough
-	name = "Involuntary Coughing"
-	symptoms = list(/datum/symptom/cough)
+/datum/disease_ability/symptom/mild
 	cost = 2
 	required_total_points = 4
+	category = "Symptom (Weak)"
+
+/datum/disease_ability/symptom/medium
+	cost = 4
+	required_total_points = 8
+	category = "Symptom"
+
+/datum/disease_ability/symptom/medium/heal
+	cost = 5
+	category = "Symptom (+)"
+
+/datum/disease_ability/symptom/powerful
+	cost = 4
+	required_total_points = 16
+	category = "Symptom (Strong)"
+
+/datum/disease_ability/symptom/powerful/heal
+	cost = 8
+	category = "Symptom (Strong+)"
+
+/******MILD******/
+
+/datum/disease_ability/symptom/mild/cough
+	name = "Involuntary Coughing"
+	symptoms = list(/datum/symptom/cough)
 	short_desc = "Cause victims to cough intermittently."
 	long_desc = "Cause victims to cough intermittently, spreading your infection if your transmissibility is high."
 
-/datum/disease_ability/symptom/sneeze
+/datum/disease_ability/symptom/mild/sneeze
 	name = "Involuntary Sneezing"
 	symptoms = list(/datum/symptom/sneeze)
-	cost = 2
-	required_total_points = 4
 	short_desc = "Cause victims to sneeze intermittently."
 	long_desc = "Cause victims to sneeze intermittently, spreading your infection and also increasing transmissibility and resistance, at the cost of stealth."
 
-/datum/disease_ability/symptom/beard
-	//I don't think I need to justify the fact that this is the best symptom
-	name = "Beard Growth"
-	symptoms = list(/datum/symptom/beard)
-	cost = 1
-	required_total_points = 8
-	short_desc = "Cause all victims to grow a luscious beard."
-	long_desc = "Cause all victims to grow a luscious beard. Decreases stats slightly. Ineffective against Santa Claus."
+/******MEDIUM******/
 
-/datum/disease_ability/symptom/hallucigen
-	name = "Hallucinations"
+/datum/disease_ability/symptom/medium/beard
+	symptoms = list(/datum/symptom/beard)
+	short_desc = "Cause all victims to grow a luscious beard."
+	long_desc = "Cause all victims to grow a luscious beard. Ineffective against Santa Claus."
+
+/datum/disease_ability/symptom/medium/hallucigen
 	symptoms = list(/datum/symptom/hallucigen)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Cause victims to hallucinate."
 	long_desc = "Cause victims to hallucinate. Decreases stats, especially resistance."
 
-
-/datum/disease_ability/symptom/choking
-	name = "Choking"
-	symptoms = list(/datum/symptom/choking)
-	cost = 4
-	required_total_points = 8
-	short_desc = "Cause victims to choke."
-	long_desc = "Cause victims to choke, threatening asphyxiation. Decreases stats, especially transmissibility."
-
-
-/datum/disease_ability/symptom/confusion
-	name = "Confusion"
+/datum/disease_ability/symptom/medium/confusion
 	symptoms = list(/datum/symptom/confusion)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Cause victims to become confused."
 	long_desc = "Cause victims to become confused intermittently."
 
-
-/datum/disease_ability/symptom/youth
-	name = "Eternal Youth"
-	symptoms = list(/datum/symptom/youth)
-	cost = 4
-	required_total_points = 8
-	short_desc = "Cause victims to become eternally young."
-	long_desc = "Cause victims to become eternally young. Provides boosts to all stats except transmissibility."
-
-
-/datum/disease_ability/symptom/vomit
-	name = "Vomiting"
+/datum/disease_ability/symptom/medium/vomit
 	symptoms = list(/datum/symptom/vomit)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Cause victims to vomit."
 	long_desc = "Cause victims to vomit. Slightly increases transmissibility. Vomiting also also causes the victims to lose nutrition and removes some toxin damage."
 
-
-/datum/disease_ability/symptom/voice_change
-	name = "Voice Changing"
+/datum/disease_ability/symptom/medium/voice_change
 	symptoms = list(/datum/symptom/voice_change)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Change the voice of victims."
 	long_desc = "Change the voice of victims, causing confusion in communications."
 
-
-/datum/disease_ability/symptom/visionloss
-	name = "Vision Loss"
+/datum/disease_ability/symptom/medium/visionloss
 	symptoms = list(/datum/symptom/visionloss)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Damage the eyes of victims, eventually causing blindness."
 	long_desc = "Damage the eyes of victims, eventually causing blindness. Decreases all stats."
 
+/datum/disease_ability/symptom/medium/deafness
+	symptoms = list(/datum/symptom/deafness)
 
-/datum/disease_ability/symptom/viraladaptation
-	name = "Self-Adaptation"
+/datum/disease_ability/symptom/medium/fever
+	symptoms = list(/datum/symptom/fever)
+
+/datum/disease_ability/symptom/medium/shivering
+	symptoms = list(/datum/symptom/shivering)
+
+/datum/disease_ability/symptom/medium/headache
+	symptoms = list(/datum/symptom/headache)
+
+/datum/disease_ability/symptom/medium/nano_boost
+	symptoms = list(/datum/symptom/nano_boost)
+
+/datum/disease_ability/symptom/medium/nano_destroy
+	symptoms = list(/datum/symptom/nano_destroy)
+
+/datum/disease_ability/symptom/medium/viraladaptation
 	symptoms = list(/datum/symptom/viraladaptation)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Cause your infection to become more resistant to detection and eradication."
 	long_desc = "Cause your infection to mimic the function of normal body cells, becoming much harder to spot and to eradicate, but reducing its speed."
 
+/datum/disease_ability/symptom/medium/viralevolution
+	symptoms = list(/datum/symptom/viralevolution)
 
-/datum/disease_ability/symptom/vitiligo
-	name = "Skin Paleness"
+/datum/disease_ability/symptom/medium/vitiligo
 	symptoms = list(/datum/symptom/vitiligo)
-	cost = 1
-	required_total_points = 8
-	short_desc = "Cause victims to become pale."
-	long_desc = "Cause victims to become pale. Decreases all stats."
 
+/datum/disease_ability/symptom/medium/revitiligo
+	symptoms = list(/datum/symptom/revitiligo)
 
-/datum/disease_ability/symptom/sensory_restoration
-	name = "Sensory Restoration"
-	symptoms = list(/datum/symptom/sensory_restoration)
-	cost = 4
-	required_total_points = 8
-	short_desc = "Regenerate eye and ear damage of victims."
-	long_desc = "Regenerate eye and ear damage of victims."
+/datum/disease_ability/symptom/medium/pierrot
+	symptoms = list(/datum/symptom/pierrot)
 
+/datum/disease_ability/symptom/medium/cockroach
+	symptoms = list(/datum/symptom/cockroach)
 
-/datum/disease_ability/symptom/itching
-	name = "Itching"
+/datum/disease_ability/symptom/medium/itching
 	symptoms = list(/datum/symptom/itching)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Cause victims to itch."
 	long_desc = "Cause victims to itch, increasing all stats except stealth."
 
-
-/datum/disease_ability/symptom/weight_loss
-	name = "Weight Loss"
+/datum/disease_ability/symptom/medium/heal/weight_loss
 	symptoms = list(/datum/symptom/weight_loss)
-	cost = 4
-	required_total_points = 8
 	short_desc = "Cause victims to lose weight."
 	long_desc = "Cause victims to lose weight, and make it almost impossible for them to gain nutrition from food. Reduced nutrition allows your infection to spread more easily from hosts, especially by sneezing."
 
+/datum/disease_ability/symptom/medium/heal/sensory_restoration
+	symptoms = list(/datum/symptom/sensory_restoration)
+	short_desc = "Regenerate eye and ear damage of victims."
+	long_desc = "Regenerate eye and ear damage of victims."
 
-/datum/disease_ability/symptom/metabolism_heal
-	name = "Metabolic Boost"
-	symptoms = list(/datum/symptom/heal/metabolism)
+/datum/disease_ability/symptom/medium/heal/mind_restoration
+	symptoms = list(/datum/symptom/mind_restoration)
+
+/******POWERFUL******/
+
+/datum/disease_ability/symptom/powerful/fire
+	symptoms = list(/datum/symptom/fire)
+
+/datum/disease_ability/symptom/powerful/flesh_eating
+	symptoms = list(/datum/symptom/flesh_eating)
+
+/datum/disease_ability/symptom/powerful/wizarditis //strong because it can remove hardsuits and bio protection
+	symptoms = list(/datum/symptom/wizarditis)
+
+/datum/disease_ability/symptom/powerful/genetic_mutation
+	symptoms = list(/datum/symptom/genetic_mutation)
+
+/datum/disease_ability/symptom/powerful/inorganic_adaptation
+	symptoms = list(/datum/symptom/inorganic_adaptation)
+
+/datum/disease_ability/symptom/powerful/narcolepsy
+	symptoms = list(/datum/symptom/narcolepsy)
+
+/datum/disease_ability/symptom/powerful/youth
+	symptoms = list(/datum/symptom/youth)
+	short_desc = "Cause victims to become eternally young."
+	long_desc = "Cause victims to become eternally young. Provides boosts to all stats except transmissibility."
+
+/****HEALING SUBTYPE****/
+
+/datum/disease_ability/symptom/powerful/heal/oxygen
+	symptoms = list(/datum/symptom/oxygen)
+
+/datum/disease_ability/symptom/powerful/heal/chem
+	symptoms = list(/datum/symptom/heal/chem)
 	cost = 4
-	required_total_points = 16
-	short_desc = "Increase the metabolism of victims, causing them to process chemicals and grow hungry faster."
-	long_desc = "Increase the metabolism of victims, causing them to process chemicals twice as fast and grow hungry more quickly."
 
-
-/datum/disease_ability/symptom/coma_heal
-	name = "Regenerative Coma"
+/datum/disease_ability/symptom/powerful/heal/coma
 	symptoms = list(/datum/symptom/heal/coma)
-	cost = 8
-	required_total_points = 16
-	short_desc = "Cause victims to fall into a healing coma when hurt."
-	long_desc = "Cause victims to fall into a healing coma when hurt."
+
+/datum/disease_ability/symptom/powerful/heal/teleport
+	symptoms = list(/datum/symptom/teleport)
+
+/datum/disease_ability/symptom/powerful/heal/growth
+	symptoms = list(/datum/symptom/growth)
+
+/datum/disease_ability/symptom/powerful/heal/EMP
+	symptoms = list(/datum/symptom/EMP)
+
+/datum/disease_ability/symptom/powerful/heal/sweat
+	symptoms = list(/datum/symptom/sweat)

From ee4c940ee5ebd89a4a76cd38e7381d68a4d654f2 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 13:53:57 -0800
Subject: [PATCH 07/21] k

---
 .../mob/living/carbon/monkey/monkey.dm        | 376 ++++++++++--------
 1 file changed, 205 insertions(+), 171 deletions(-)

diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 0796b713..a9f604fa 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -1,171 +1,205 @@
-/mob/living/carbon/monkey
-	name = "monkey"
-	verb_say = "chimpers"
-	initial_language_holder = /datum/language_holder/monkey
-	icon = 'icons/mob/monkey.dmi'
-	icon_state = ""
-	gender = NEUTER
-	pass_flags = PASSTABLE
-	ventcrawler = VENTCRAWLER_NUDE
-	mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
-	type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/monkey
-	gib_type = /obj/effect/decal/cleanable/blood/gibs
-	unique_name = TRUE
-	bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
-					 /obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
-	hud_type = /datum/hud/monkey
-
-/mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner)
-	verbs += /mob/living/proc/mob_sleep
-	verbs += /mob/living/proc/lay_down
-
-	if(unique_name) //used to exclude pun pun
-		gender = pick(MALE, FEMALE)
-	real_name = name
-
-	//initialize limbs
-	create_bodyparts()
-	create_internal_organs()
-
-	. = ..()
-
-	if (cubespawned)
-		var/cap = CONFIG_GET(number/monkeycap)
-		if (LAZYLEN(SSmobs.cubemonkeys) > cap)
-			if (spawner)
-				to_chat(spawner, "<span class='warning'>Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!</span>")
-			return INITIALIZE_HINT_QDEL
-		SSmobs.cubemonkeys += src
-
-	create_dna(src)
-	dna.initialize_dna(random_blood_type())
-
-/mob/living/carbon/monkey/Destroy()
-	SSmobs.cubemonkeys -= src
-	return ..()
-
-/mob/living/carbon/monkey/create_internal_organs()
-	internal_organs += new /obj/item/organ/appendix
-	internal_organs += new /obj/item/organ/lungs
-	internal_organs += new /obj/item/organ/heart
-	internal_organs += new /obj/item/organ/brain
-	internal_organs += new /obj/item/organ/tongue
-	internal_organs += new /obj/item/organ/eyes
-	internal_organs += new /obj/item/organ/ears
-	internal_organs += new /obj/item/organ/liver
-	internal_organs += new /obj/item/organ/stomach
-	..()
-
-/mob/living/carbon/monkey/on_reagent_change()
-	. = ..()
-	remove_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE)
-	var/amount
-	if(reagents.has_reagent("morphine"))
-		amount = -1
-	if(reagents.has_reagent("nuka_cola"))
-		amount = -1
-	if(amount)
-		add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
-
-/mob/living/carbon/monkey/updatehealth()
-	. = ..()
-	var/slow = 0
-	var/health_deficiency = (100 - health)
-	if(health_deficiency >= 45)
-		slow += (health_deficiency / 25)
-	add_movespeed_modifier(MOVESPEED_ID_MONKEY_HEALTH_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = slow)
-
-/mob/living/carbon/monkey/adjust_bodytemperature(amount)
-	. = ..()
-	var/slow = 0
-	if (bodytemperature < 283.222)
-		slow += (283.222 - bodytemperature) / 10 * 1.75
-	if(slow <= 0)
-		return
-	add_movespeed_modifier(MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
-
-/mob/living/carbon/monkey/Stat()
-	..()
-	if(statpanel("Status"))
-		stat(null, "Intent: [a_intent]")
-		stat(null, "Move Mode: [m_intent]")
-		if(client && mind)
-			var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
-			if(changeling)
-				stat("Chemical Storage", "[changeling.chem_charges]/[changeling.chem_storage]")
-				stat("Absorbed DNA", changeling.absorbedcount)
-	return
-
-
-/mob/living/carbon/monkey/verb/removeinternal()
-	set name = "Remove Internals"
-	set category = "IC"
-	internal = null
-	return
-
-
-/mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
-	if(mind && is_monkey(mind))
-		return TRUE
-	return FALSE
-
-/mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents
-	return FALSE
-
-/mob/living/carbon/monkey/canBeHandcuffed()
-	return TRUE
-
-/mob/living/carbon/monkey/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
-	if(judgement_criteria & JUDGE_EMAGGED)
-		return 10 //Everyone is a criminal!
-
-	var/threatcount = 0
-
-	//Securitrons can't identify monkeys
-	if( !(judgement_criteria & JUDGE_IGNOREMONKEYS) && (judgement_criteria & JUDGE_IDCHECK) )
-		threatcount += 4
-
-	//Lasertag bullshit
-	if(lasercolor)
-		if(lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve
-			if(is_holding_item_of_type(/obj/item/gun/energy/laser/redtag))
-				threatcount += 4
-
-		if(lasercolor == "r")
-			if(is_holding_item_of_type(/obj/item/gun/energy/laser/bluetag))
-				threatcount += 4
-
-		return threatcount
-
-	//Check for weapons
-	if( (judgement_criteria & JUDGE_WEAPONCHECK) && weaponcheck )
-		for(var/obj/item/I in held_items) //if they're holding a gun
-			if(weaponcheck.Invoke(I))
-				threatcount += 4
-		if(weaponcheck.Invoke(back)) //if a weapon is present in the back slot
-			threatcount += 4 //trigger look_for_perp() since they're nonhuman and very likely hostile
-
-	//mindshield implants imply trustworthyness
-	if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
-		threatcount -= 1
-
-	return threatcount
-
-/mob/living/carbon/monkey/IsVocal()
-	if(!getorganslot(ORGAN_SLOT_LUNGS))
-		return 0
-	return 1
-
-/mob/living/carbon/monkey/can_use_guns(obj/item/G)
-	return TRUE
-
-/mob/living/carbon/monkey/angry
-	aggressive = TRUE
-
-/mob/living/carbon/monkey/angry/Initialize()
-	. = ..()
-	if(prob(10))
-		var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src)
-		equip_to_slot_or_del(helmet,SLOT_HEAD)
-		helmet.attack_self(src) // todo encapsulate toggle
+/mob/living/carbon/monkey
+	name = "monkey"
+	verb_say = "chimpers"
+	initial_language_holder = /datum/language_holder/monkey
+	icon = 'icons/mob/monkey.dmi'
+	icon_state = "monkey1"
+	gender = NEUTER
+	pass_flags = PASSTABLE
+	ventcrawler = VENTCRAWLER_NUDE
+	mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
+	type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/monkey
+	gib_type = /obj/effect/decal/cleanable/blood/gibs
+	unique_name = TRUE
+	bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
+					 /obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
+	hud_type = /datum/hud/monkey
+
+/mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner)
+	verbs += /mob/living/proc/mob_sleep
+	verbs += /mob/living/proc/lay_down
+
+	if(unique_name) //used to exclude pun pun
+		gender = pick(MALE, FEMALE)
+	real_name = name
+
+	//initialize limbs
+	create_bodyparts()
+	create_internal_organs()
+
+	. = ..()
+
+	if (cubespawned)
+		var/cap = CONFIG_GET(number/max_cube_monkeys)
+		if (LAZYLEN(SSmobs.cubemonkeys) > cap)
+			if (spawner)
+				to_chat(spawner, "<span class='warning'>Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!</span>")
+			return INITIALIZE_HINT_QDEL
+		SSmobs.cubemonkeys += src
+
+	create_dna(src)
+	dna.initialize_dna(random_blood_type())
+
+/mob/living/carbon/monkey/Destroy()
+	SSmobs.cubemonkeys -= src
+	return ..()
+
+/mob/living/carbon/monkey/create_internal_organs()
+	internal_organs += new /obj/item/organ/appendix
+	internal_organs += new /obj/item/organ/lungs
+	internal_organs += new /obj/item/organ/heart
+	internal_organs += new /obj/item/organ/brain
+	internal_organs += new /obj/item/organ/tongue
+	internal_organs += new /obj/item/organ/eyes
+	internal_organs += new /obj/item/organ/ears
+	internal_organs += new /obj/item/organ/liver
+	internal_organs += new /obj/item/organ/stomach
+	..()
+
+/mob/living/carbon/monkey/on_reagent_change()
+	. = ..()
+	remove_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE)
+	var/amount
+	if(reagents.has_reagent(/datum/reagent/medicine/morphine))
+		amount = -1
+	if(reagents.has_reagent(/datum/reagent/consumable/nuka_cola))
+		amount = -1
+	if(amount)
+		add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
+
+/mob/living/carbon/monkey/updatehealth()
+	. = ..()
+	var/slow = 0
+	if(!HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
+		var/health_deficiency = (maxHealth - health)
+		if(health_deficiency >= 45)
+			slow += (health_deficiency / 25)
+	add_movespeed_modifier(MOVESPEED_ID_MONKEY_HEALTH_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = slow)
+
+/mob/living/carbon/monkey/adjust_bodytemperature(amount)
+	. = ..()
+	var/slow = 0
+	if (bodytemperature < 283.222)
+		slow += ((283.222 - bodytemperature) / 10) * 1.75
+	add_movespeed_modifier(MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = slow)
+
+/mob/living/carbon/monkey/Stat()
+	..()
+	if(statpanel("Status"))
+		stat(null, "Intent: [a_intent]")
+		stat(null, "Move Mode: [m_intent]")
+		if(client && mind)
+			var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
+			if(changeling)
+				stat("Chemical Storage", "[changeling.chem_charges]/[changeling.chem_storage]")
+				stat("Absorbed DNA", changeling.absorbedcount)
+	return
+
+
+/mob/living/carbon/monkey/verb/removeinternal()
+	set name = "Remove Internals"
+	set category = "IC"
+	internal = null
+	return
+
+
+/mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
+	if(mind && is_monkey(mind))
+		return TRUE
+	return FALSE
+
+/mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents
+	return FALSE
+
+/mob/living/carbon/monkey/canBeHandcuffed()
+	return TRUE
+
+/mob/living/carbon/monkey/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
+	if(judgement_criteria & JUDGE_EMAGGED)
+		return 10 //Everyone is a criminal!
+
+	var/threatcount = 0
+
+	//Securitrons can't identify monkeys
+	if( !(judgement_criteria & JUDGE_IGNOREMONKEYS) && (judgement_criteria & JUDGE_IDCHECK) )
+		threatcount += 4
+
+	//Lasertag bullshit
+	if(lasercolor)
+		if(lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve
+			if(is_holding_item_of_type(/obj/item/gun/energy/laser/redtag))
+				threatcount += 4
+
+		if(lasercolor == "r")
+			if(is_holding_item_of_type(/obj/item/gun/energy/laser/bluetag))
+				threatcount += 4
+
+		return threatcount
+
+	//Check for weapons
+	if( (judgement_criteria & JUDGE_WEAPONCHECK) && weaponcheck )
+		for(var/obj/item/I in held_items) //if they're holding a gun
+			if(weaponcheck.Invoke(I))
+				threatcount += 4
+		if(weaponcheck.Invoke(back)) //if a weapon is present in the back slot
+			threatcount += 4 //trigger look_for_perp() since they're nonhuman and very likely hostile
+
+	//mindshield implants imply trustworthyness
+	if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
+		threatcount -= 1
+
+	return threatcount
+
+/mob/living/carbon/monkey/get_permeability_protection()
+	var/protection = 0
+	if(head)
+		protection = 1 - head.permeability_coefficient
+	if(wear_mask)
+		protection = max(1 - wear_mask.permeability_coefficient, protection)
+	protection = protection/7 //the rest of the body isn't covered.
+	return protection
+
+/mob/living/carbon/monkey/IsVocal()
+	if(!getorganslot(ORGAN_SLOT_LUNGS))
+		return 0
+	return 1
+
+/mob/living/carbon/monkey/can_use_guns(obj/item/G)
+	return TRUE
+
+/mob/living/carbon/monkey/angry
+	aggressive = TRUE
+
+/mob/living/carbon/monkey/angry/Initialize()
+	. = ..()
+	if(prob(10))
+		var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src)
+		equip_to_slot_or_del(helmet,SLOT_HEAD)
+		helmet.attack_self(src) // todo encapsulate toggle
+
+
+//Special monkeycube subtype to track the number of them and prevent spam
+/mob/living/carbon/monkey/cube/Initialize()
+	. = ..()
+	GLOB.total_cube_monkeys++
+
+/mob/living/carbon/monkey/cube/death(gibbed)
+	GLOB.total_cube_monkeys--
+	..()
+
+//In case admins delete them before they die
+/mob/living/carbon/monkey/cube/Destroy()
+	if(stat != DEAD)
+		GLOB.total_cube_monkeys--
+	return ..()
+
+/mob/living/carbon/monkey/tumor
+	name = "living teratoma"
+	verb_say = "blabbers"
+	initial_language_holder = /datum/language_holder/monkey
+	icon = 'icons/mob/monkey.dmi'
+	icon_state = "abomination"
+	butcher_results = list(/obj/effect/spawner/lootdrop/teratoma/minor = 5, /obj/effect/spawner/lootdrop/teratoma/major = 1)
+	type_of_meat = /obj/effect/spawner/lootdrop/teratoma/minor
+	aggressive = TRUE

From ac23e48246361507113409f6661f69b2583509f0 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Wed, 19 Feb 2020 14:19:44 -0800
Subject: [PATCH 08/21] FUCK monkeys

not that way tho
---
 .../mob/living/carbon/monkey/monkey.dm        | 46 +++++--------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index a9f604fa..c0ac26ae 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -3,7 +3,7 @@
 	verb_say = "chimpers"
 	initial_language_holder = /datum/language_holder/monkey
 	icon = 'icons/mob/monkey.dmi'
-	icon_state = "monkey1"
+	icon_state = ""
 	gender = NEUTER
 	pass_flags = PASSTABLE
 	ventcrawler = VENTCRAWLER_NUDE
@@ -31,7 +31,7 @@
 	. = ..()
 
 	if (cubespawned)
-		var/cap = CONFIG_GET(number/max_cube_monkeys)
+		var/cap = CONFIG_GET(number/monkeycap)
 		if (LAZYLEN(SSmobs.cubemonkeys) > cap)
 			if (spawner)
 				to_chat(spawner, "<span class='warning'>Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!</span>")
@@ -61,9 +61,9 @@
 	. = ..()
 	remove_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE)
 	var/amount
-	if(reagents.has_reagent(/datum/reagent/medicine/morphine))
+	if(reagents.has_reagent("morphine"))
 		amount = -1
-	if(reagents.has_reagent(/datum/reagent/consumable/nuka_cola))
+	if(reagents.has_reagent("nuka_cola"))
 		amount = -1
 	if(amount)
 		add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
@@ -71,18 +71,19 @@
 /mob/living/carbon/monkey/updatehealth()
 	. = ..()
 	var/slow = 0
-	if(!HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
-		var/health_deficiency = (maxHealth - health)
-		if(health_deficiency >= 45)
-			slow += (health_deficiency / 25)
+	var/health_deficiency = (100 - health)
+	if(health_deficiency >= 45)
+		slow += (health_deficiency / 25)
 	add_movespeed_modifier(MOVESPEED_ID_MONKEY_HEALTH_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = slow)
 
 /mob/living/carbon/monkey/adjust_bodytemperature(amount)
 	. = ..()
 	var/slow = 0
 	if (bodytemperature < 283.222)
-		slow += ((283.222 - bodytemperature) / 10) * 1.75
-	add_movespeed_modifier(MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = slow)
+		slow += (283.222 - bodytemperature) / 10 * 1.75
+	if(slow <= 0)
+		return
+	add_movespeed_modifier(MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
 
 /mob/living/carbon/monkey/Stat()
 	..()
@@ -151,15 +152,6 @@
 
 	return threatcount
 
-/mob/living/carbon/monkey/get_permeability_protection()
-	var/protection = 0
-	if(head)
-		protection = 1 - head.permeability_coefficient
-	if(wear_mask)
-		protection = max(1 - wear_mask.permeability_coefficient, protection)
-	protection = protection/7 //the rest of the body isn't covered.
-	return protection
-
 /mob/living/carbon/monkey/IsVocal()
 	if(!getorganslot(ORGAN_SLOT_LUNGS))
 		return 0
@@ -178,22 +170,6 @@
 		equip_to_slot_or_del(helmet,SLOT_HEAD)
 		helmet.attack_self(src) // todo encapsulate toggle
 
-
-//Special monkeycube subtype to track the number of them and prevent spam
-/mob/living/carbon/monkey/cube/Initialize()
-	. = ..()
-	GLOB.total_cube_monkeys++
-
-/mob/living/carbon/monkey/cube/death(gibbed)
-	GLOB.total_cube_monkeys--
-	..()
-
-//In case admins delete them before they die
-/mob/living/carbon/monkey/cube/Destroy()
-	if(stat != DEAD)
-		GLOB.total_cube_monkeys--
-	return ..()
-
 /mob/living/carbon/monkey/tumor
 	name = "living teratoma"
 	verb_say = "blabbers"

From 119416aececa1bdc357468cc3f2f6e6283f631fb Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Sun, 23 Feb 2020 17:16:59 -0800
Subject: [PATCH 09/21] e

---
 icons/mob/animal_parts.dmi | Bin 4673 -> 5388 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/mob/animal_parts.dmi b/icons/mob/animal_parts.dmi
index 375df9341bf87d1f8faa466bb29866c8cd06dd14..d51bd882baeaac597491078e664f846f4041ce8b 100644
GIT binary patch
literal 5388
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
b3dezG?wxS|;Ho(NC!QBd8j4l&R^k5wD;YUq

literal 4673
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


From 23b937c4ecb066dd0c71f870b1075ae97625d762 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Sun, 23 Feb 2020 17:17:55 -0800
Subject: [PATCH 10/21] Update mobs.dm

---
 code/__DEFINES/mobs.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 1a7340d0..e7981362 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -62,6 +62,7 @@
 #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi'
 
 #define MONKEY_BODYPART "monkey"
+#define TERATOMA_BODYPART "teratoma"
 #define ALIEN_BODYPART "alien"
 #define LARVA_BODYPART "larva"
 #define DEVIL_BODYPART "devil"

From be804471c83295d886d8af8e4c1d1dc2e01a9cfc Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Sun, 23 Feb 2020 17:20:24 -0800
Subject: [PATCH 11/21] Update head.dm

---
 code/modules/surgery/bodyparts/head.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 46ee10a3..9057ceca 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -184,6 +184,10 @@
 	icon_state = "default_monkey_head"
 	animal_origin = MONKEY_BODYPART
 
+/obj/item/bodypart/head/monkey/teratoma
+	icon_state = "teratoma_head"
+	animal_origin = TERATOMA_BODYPART
+
 /obj/item/bodypart/head/alien
 	icon = 'icons/mob/animal_parts.dmi'
 	icon_state = "alien_head"

From 2312f4a5a78ad43776b0d6bec44e6c2451cafd1f Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Sun, 23 Feb 2020 17:24:10 -0800
Subject: [PATCH 12/21] Update bodyparts.dm

---
 code/modules/surgery/bodyparts/bodyparts.dm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index da8efcab..f79cdaee 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -591,6 +591,10 @@
 	icon_state = "default_monkey_chest"
 	animal_origin = MONKEY_BODYPART
 
+/obj/item/bodypart/chest/monkey/teratoma
+	icon_state = "teratoma_chest"
+	animal_origin = TERATOMA_BODYPART
+
 /obj/item/bodypart/chest/alien
 	icon = 'icons/mob/animal_parts.dmi'
 	icon_state = "alien_chest"
@@ -663,6 +667,10 @@
 	px_x = -5
 	px_y = -3
 
+/obj/item/bodypart/l_arm/monkey/teratoma
+	icon_state = "teratoma_l_arm"
+	animal_origin = TERATOMA_BODYPART
+
 /obj/item/bodypart/l_arm/alien
 	icon = 'icons/mob/animal_parts.dmi'
 	icon_state = "alien_l_arm"
@@ -729,6 +737,10 @@
 	px_x = 5
 	px_y = -3
 
+/obj/item/bodypart/r_arm/monkey/teratoma
+	icon_state = "teratoma_r_arm"
+	animal_origin = TERATOMA_BODYPART
+
 /obj/item/bodypart/r_arm/alien
 	icon = 'icons/mob/animal_parts.dmi'
 	icon_state = "alien_r_arm"
@@ -787,6 +799,10 @@
 	animal_origin = MONKEY_BODYPART
 	px_y = 4
 
+/obj/item/bodypart/l_leg/monkey/teratoma
+	icon_state = "teratoma_l_leg"
+	animal_origin = TERATOMA_BODYPART
+
 /obj/item/bodypart/l_leg/alien
 	icon = 'icons/mob/animal_parts.dmi'
 	icon_state = "alien_l_leg"
@@ -845,6 +861,10 @@
 	icon_state = "default_monkey_r_leg"
 	animal_origin = MONKEY_BODYPART
 	px_y = 4
+	
+/obj/item/bodypart/r_leg/monkey/teratoma
+	icon_state = "teratoma_r_leg"
+	animal_origin = TERATOMA_BODYPART
 
 /obj/item/bodypart/r_leg/alien
 	icon = 'icons/mob/animal_parts.dmi'

From 632d06c747be15ae1eefa7850075c400a360f4a0 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Sun, 23 Feb 2020 17:25:04 -0800
Subject: [PATCH 13/21] Update monkey.dm

---
 code/modules/mob/living/carbon/monkey/monkey.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index c0ac26ae..321c1b51 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -175,7 +175,9 @@
 	verb_say = "blabbers"
 	initial_language_holder = /datum/language_holder/monkey
 	icon = 'icons/mob/monkey.dmi'
-	icon_state = "abomination"
+	icon_state = ""
 	butcher_results = list(/obj/effect/spawner/lootdrop/teratoma/minor = 5, /obj/effect/spawner/lootdrop/teratoma/major = 1)
 	type_of_meat = /obj/effect/spawner/lootdrop/teratoma/minor
 	aggressive = TRUE
+		bodyparts = list(/obj/item/bodypart/chest/monkey/teratoma, /obj/item/bodypart/head/monkey/teratoma, /obj/item/bodypart/l_arm/monkey/teratoma,
+					 /obj/item/bodypart/r_arm/monkey/teratoma, /obj/item/bodypart/r_leg/monkey/teratoma, /obj/item/bodypart/l_leg/monkey/teratoma)

From 9adf4d194be3ee1618fe98566700d1e8bbffea4c Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 11:33:03 -0800
Subject: [PATCH 14/21] Update monkey.dm

---
 code/modules/mob/living/carbon/monkey/monkey.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 321c1b51..7b44a01a 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -179,5 +179,5 @@
 	butcher_results = list(/obj/effect/spawner/lootdrop/teratoma/minor = 5, /obj/effect/spawner/lootdrop/teratoma/major = 1)
 	type_of_meat = /obj/effect/spawner/lootdrop/teratoma/minor
 	aggressive = TRUE
-		bodyparts = list(/obj/item/bodypart/chest/monkey/teratoma, /obj/item/bodypart/head/monkey/teratoma, /obj/item/bodypart/l_arm/monkey/teratoma,
+	bodyparts = list(/obj/item/bodypart/chest/monkey/teratoma, /obj/item/bodypart/head/monkey/teratoma, /obj/item/bodypart/l_arm/monkey/teratoma,
 					 /obj/item/bodypart/r_arm/monkey/teratoma, /obj/item/bodypart/r_leg/monkey/teratoma, /obj/item/bodypart/l_leg/monkey/teratoma)

From ef17fd5fee586688e50c595377395307114805bc Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 11:33:43 -0800
Subject: [PATCH 15/21] Update skin.dm

---
 code/datums/diseases/advance/symptoms/skin.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm
index 7cc84ae7..2d20ca80 100644
--- a/code/datums/diseases/advance/symptoms/skin.dm
+++ b/code/datums/diseases/advance/symptoms/skin.dm
@@ -110,7 +110,7 @@ BONUS
 	resistance = 1
 	stage_speed = 2
 	transmittable = 2
-	level = 4
+	level = 0
 	severity = 1
 	base_message_chance = 50
 	symptom_delay_min = 45
@@ -128,4 +128,4 @@ BONUS
 				M.reagents.add_reagent(color, 5)
 		else
 			if (prob(50)) // spam
-				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")
\ No newline at end of file
+				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")

From 78413f5f826e3941c807ec899f02c9b8ba93e5e1 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 11:37:54 -0800
Subject: [PATCH 16/21] nerfs beneficial threshold

---
 code/datums/diseases/advance/symptoms/genetics.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm
index 87e6286e..fbfa41a2 100644
--- a/code/datums/diseases/advance/symptoms/genetics.dm
+++ b/code/datums/diseases/advance/symptoms/genetics.dm
@@ -60,7 +60,7 @@ Bonus
 	if(A.properties["resistance"] >= 8) //mutate twice
 		power = 2
 	if(A.properties["stage_rate"] >= 14)
-		possible_mutations = (GLOB.good_mutations) - GLOB.all_mutations[RACEMUT]
+		possible_mutations = (GLOB.good_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT]
 	else
 		possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT]
 	var/mob/living/carbon/M = A.affected_mob

From f194bd9cf46568f31dd632bf69d93cf969a53833 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 11:56:20 -0800
Subject: [PATCH 17/21] balance changes

---
 .../diseases/advance/symptoms/radiation.dm    | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/radiation.dm b/code/datums/diseases/advance/symptoms/radiation.dm
index c52ae6a8..17447f90 100644
--- a/code/datums/diseases/advance/symptoms/radiation.dm
+++ b/code/datums/diseases/advance/symptoms/radiation.dm
@@ -7,18 +7,15 @@
 	transmittable = 2
 	level = 8
 	severity = 4
-	symptom_delay_min = 1
-	symptom_delay_max = 4
+	symptom_delay_min = 10
+	symptom_delay_max = 40
 	var/fastrads = FALSE
 	var/radothers = FALSE
-	threshold_desc = "<b>Transmission 12:</b> Makes the host irradiate others around them as well.<br>\
-					  <b>Speed 8:</b> Host takes radiation damage faster."
+	threshold_desc = "<b>Speed 8:</b> Host takes radiation damage faster."
 
 /datum/symptom/radiation/Start(datum/disease/advance/A)
 	if(!..())
 		return
-	if(A.properties["transmission"] >= 10)
-		radothers = TRUE
 	if(A.properties["speed"] >= 8)
 		fastrads = TRUE
 
@@ -34,18 +31,12 @@
 			if(prob(50))
 				to_chat(M, "<span class='danger'>You feel like the atoms inside you are beginning to split...</span>")
 		if(4, 5)
-			if(fastrads)
-				radiate(M, 80)
-			else
-				radiate(M, 40)
-			if(radothers && A.stage == 5)
-				if(prob(40))
-					M.visible_message("<span class='danger'>[M] glows green for a moment!</span>", \
-								 	  "<span class='userdanger'>You feel a massive wave of pain flow through you!</span>")
-					radiation_pulse(M, 20)
-			
+			radiate(M)
 
-/datum/symptom/radiation/proc/radiate(mob/living/carbon/M, chance)
-	if(prob(chance))
-		to_chat(M, "<span class='danger'>You feel a wave of pain throughout your body!</span>")
-		M.radiation += 4
+/datum/symptom/radiation/proc/radiate(mob/living/carbon/M)
+	to_chat(M, "<span class='danger'>You feel a wave of pain throughout your body!</span>")
+	if(fastrads)
+		M.radiation += 150
+	else
+		M.radiation += 75
+	return 1

From 81fbc375b0274c0cddaa6c0c43ed15fb454bcf9a Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 12:06:40 -0800
Subject: [PATCH 18/21] Update beebox.dm

---
 code/modules/hydroponics/beekeeping/beebox.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index e26dab07..e9ec7eff 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -23,6 +23,8 @@
 		var/obj/item/clothing/CH = head
 		if (CS.clothing_flags & CH.clothing_flags & THICKMATERIAL)
 			return 1
+	if(HAS_TRAIT(src, TRAIT_BEEFRIEND))
+		return 1
 	return 0
 
 

From 595b4716076e4dfdf3dfad5c1983da0e13fc5206 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 12:09:29 -0800
Subject: [PATCH 19/21] Update traits.dm

---
 code/__DEFINES/traits.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 01ab0933..38fec276 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -118,6 +118,7 @@
 #define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
 #define	TRAIT_STRONG_GRABBER	"strong_grabber"
 #define	TRAIT_CALCIUM_HEALER	"calcium_healer"
+#define TRAIT_BEEFRIEND 		"beefriend"
 
  //non-mob traits
 #define TRAIT_PARALYSIS			"paralysis" //Used for limb-based paralysis, where replacing the limb will fix it

From b8522cc0c7a1a11b1e2f16557d2595024f77ae23 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 12:14:39 -0800
Subject: [PATCH 20/21] adds special honey

---
 .../chemistry/reagents/food_reagents.dm       | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 1095e60e..e203bc94 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -604,21 +604,23 @@
 	..()
 
 /datum/reagent/consumable/honey
-	name = "honey"
+	name = "Honey"
 	id = "honey"
 	description = "Sweet sweet honey that decays into sugar. Has antibacterial and natural healing properties."
 	color = "#d3a308"
 	nutriment_factor = 15 * REAGENTS_METABOLISM
 	metabolization_rate = 1 * REAGENTS_METABOLISM
 	taste_description = "sweetness"
+	var/power = 0
 
 /datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/M)
-	M.reagents.add_reagent("sugar",3)
+	if(power == 0)
+		M.reagents.add_reagent(/datum/reagent/consumable/sugar,3)
 	if(prob(55))
-		M.adjustBruteLoss(-1*REM, 0)
-		M.adjustFireLoss(-1*REM, 0)
-		M.adjustOxyLoss(-1*REM, 0)
-		M.adjustToxLoss(-1*REM, 0)
+		M.adjustBruteLoss(-1*REM+power, 0)
+		M.adjustFireLoss(-1*REM+power, 0)
+		M.adjustOxyLoss(-1*REM+power, 0)
+		M.adjustToxLoss(-1*REM+power, 0)
 	..()
 
 /datum/reagent/consumable/honey/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -629,6 +631,12 @@
       S.success_multiplier = max(0.6, S.success_multiplier) // +60% success probability on each step, compared to bacchus' blessing's ~46%
   ..()
 
+/datum/reagent/consumable/honey/special
+	name = "Royal Honey"
+	id = "royalhoney"
+	description = "A special honey which heals the imbiber far faster than normal honey"
+	power = 1
+
 /datum/reagent/consumable/mayonnaise
 	name = "Mayonnaise"
 	id = "mayonnaise"

From 8e28953bb53fab684506697e6c714eae9c05ccc4 Mon Sep 17 00:00:00 2001
From: zeskorion <49600480+zeskorion@users.noreply.github.com>
Date: Thu, 27 Feb 2020 12:43:53 -0800
Subject: [PATCH 21/21] balance changes

---
 .../diseases/advance/symptoms/beesymptom.dm   | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/beesymptom.dm b/code/datums/diseases/advance/symptoms/beesymptom.dm
index b56f2dc8..a5e530e9 100644
--- a/code/datums/diseases/advance/symptoms/beesymptom.dm
+++ b/code/datums/diseases/advance/symptoms/beesymptom.dm
@@ -2,7 +2,7 @@
 	name = "Bee Infestation"
 	desc = "Causes the host to cough toxin bees and occasionally synthesize toxin."
 	stealth = -2
-	resistance = 2
+	resistance = 14
 	stage_speed = 1
 	transmittable = 1
 	level = 9
@@ -11,14 +11,15 @@
 	symptom_delay_max = 20
 	var/honey = FALSE
 	var/toxic_bees= FALSE
-	threshold_desc = "<b>Resistance 14:</b> Host synthesizes honey instead of toxins, bees now sting with honey instead of toxin.<br>\
-					  <b>Transmission 10:</b> Bees now contain a completely random toxin, unless resistance exceeds 14"		
-					  
+	threshold_desc = "<b>Resistance 14:</b> The bees become symbiotic with the host, synthesizing honey and no longer stinging the stomach lining, and no longer attacking the host.<br>\
+					  <b>Transmission 10:</b> Bees now contain a completely random toxin, unless resistance exceeds 14"
+
 /datum/symptom/beesease/Start(datum/disease/advance/A)
 	if(!..())
 		return
 	if(A.properties["resistance"] >= 14)
 		honey = TRUE
+		severity = 0
 	if(A.properties["transmittable"] >= 10)
 		toxic_bees = TRUE
 
@@ -38,18 +39,20 @@
 					to_chat(M, "<span class='notice'>You can't get the taste of honey out of your mouth!.</span>")
 					M.reagents.add_reagent(/datum/reagent/consumable/honey, 2)
 				else
-					to_chat(M, "<span class='danger'>Your stomach stings painfully.</span>")				
+					to_chat(M, "<span class='danger'>Your stomach stings painfully.</span>")
 					M.adjustToxLoss(5)
 					M.updatehealth()
 		if(4, 5)
+			if(honey)
+				ADD_TRAIT(M, TRAIT_BEEFRIEND, DISEASE_TRAIT)
 			if(prob(15))
 				to_chat(M, "<span class='notice'>Your stomach squirms.</span>")
-			if(prob(15))
+			if(prob(25))
 				if(honey)
 					to_chat(M, "<span class='notice'>You can't get the taste of honey out of your mouth!.</span>")
-					M.reagents.add_reagent_list(list(/datum/reagent/consumable/honey = 5, /datum/reagent/medicine/insulin = 15)) //honey rooooughly equivalent to 1.5u omnizine. due to how honey synthesizes 7.5 sugar per unit, the large amounts of insulin are necessary to prevent hyperglycaemic shock due to the bees
+					M.reagents.add_reagent_list(list(/datum/reagent/consumable/honey = 10, /datum/reagent/consumable/honey/special = 5, /datum/reagent/medicine/insulin = 5)) //insulin prevents hyperglycemic shock
 				else
-					to_chat(M, "<span class='danger'>Your stomach stings painfully.</span>")				
+					to_chat(M, "<span class='danger'>Your stomach stings painfully.</span>")
 					M.adjustToxLoss(5)
 					M.updatehealth()
 			if(prob(10))
@@ -60,10 +63,12 @@
 			if(prob(10))
 				M.visible_message("<span class='danger'>[M] coughs up a bee!</span>", \
 								  "<span class='userdanger'>You cough up a bee!</span>")
-				if(honey)
-					var/mob/living/simple_animal/hostile/poison/bees/B = new(M.loc)
-					B.assign_reagent(GLOB.chemical_reagents_list[/datum/reagent/consumable/honey])
-				else if(toxic_bees)
+				if(toxic_bees)
 					new /mob/living/simple_animal/hostile/poison/bees/toxin(M.loc)
 				else
 					new /mob/living/simple_animal/hostile/poison/bees(M.loc)
+
+/datum/symptom/beesease/End(datum/disease/advance/A)
+	if(!..())
+		return
+	REMOVE_TRAIT(A.affected_mob, TRAIT_BEEFRIEND, DISEASE_TRAIT)