July 5th TG sync (#1883)

July 5th TG sync

code/datums/diseases/_MobProcs.dm

@@ -46,7 +46,7 @@
 		for(var/V in DD.vars)
 			if(V in skipped)
 				continue
-			if(istype(DD.vars[V],/list))
+			if(islist(DD.vars[V]))
 				var/list/L = D.vars[V]
 				DD.vars[V] = L.Copy()
 			else

code/datums/diseases/advance/advance.dm

@@ -1,433 +1,433 @@
-/*
-
-	Advance Disease is a system for Virologist to Engineer their own disease with symptoms that have effects and properties
-	which add onto the overall disease.
-
-	If you need help with creating new symptoms or expanding the advance disease, ask for Giacom on #coderbus.
-
-*/
-
-#define SYMPTOM_LIMIT 8
-
-
-
-/*
-
-	PROPERTIES
-
- */
-
-/datum/disease/advance
-
-	name = "Unknown" // We will always let our Virologist name our disease.
-	desc = "An engineered disease which can contain a multitude of symptoms."
-	form = "Advance Disease" // Will let med-scanners know that this disease was engineered.
-	agent = "advance microbes"
-	max_stages = 5
-	spread_text = "Unknown"
-	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-
-	// NEW VARS
-	var/list/properties = list()
-	var/list/symptoms = list() // The symptoms of the disease.
-	var/id = ""
-	var/processing = 0
+/*
 
-	// The order goes from easy to cure to hard to cure.
-	var/static/list/advance_cures = 	list(
-									"sodiumchloride", "sugar", "orangejuice",
-									"spaceacillin", "salglu_solution", "ethanol",
-									"leporazine", "synaptizine", "lipolicide",
-									"silver", "gold"
-								)
-
-/*
-
-	OLD PROCS
-
- */
-
-/datum/disease/advance/New(var/process = 1, var/datum/disease/advance/D)
-	if(!istype(D))
-		D = null
-	// Generate symptoms if we weren't given any.
-
-	if(!symptoms || !symptoms.len)
-
-		if(!D || !D.symptoms || !D.symptoms.len)
-			symptoms = GenerateSymptoms(0, 2)
-		else
-			for(var/datum/symptom/S in D.symptoms)
-				symptoms += new S.type
-
-	Refresh()
-	..(process, D)
-	return
-
-/datum/disease/advance/Destroy()
-	if(processing)
-		for(var/datum/symptom/S in symptoms)
-			S.End(src)
-	return ..()
-
-// Randomly pick a symptom to activate.
-/datum/disease/advance/stage_act()
-	..()
-	if(symptoms && symptoms.len)
-
-		if(!processing)
-			processing = 1
-			for(var/datum/symptom/S in symptoms)
-				S.Start(src)
-
-		for(var/datum/symptom/S in symptoms)
-			S.Activate(src)
-	else
-		CRASH("We do not have any symptoms during stage_act()!")
-
-// Compares type then ID.
-/datum/disease/advance/IsSame(datum/disease/advance/D)
-
-	if(!(istype(D, /datum/disease/advance)))
-		return 0
-
-	if(src.GetDiseaseID() != D.GetDiseaseID())
-		return 0
-	return 1
-
-// To add special resistances.
-/datum/disease/advance/cure(resistance=1)
-	if(affected_mob)
-		var/id = "[GetDiseaseID()]"
-		if(resistance && !(id in affected_mob.resistances))
-			affected_mob.resistances[id] = id
-		remove_virus()
-	qdel(src)	//delete the datum to stop it processing
-
-// Returns the advance disease with a different reference memory.
-/datum/disease/advance/Copy(process = 0)
-	return new /datum/disease/advance(process, src, 1)
-
-/*
-
-	NEW PROCS
-
- */
-
-// Mix the symptoms of two diseases (the src and the argument)
-/datum/disease/advance/proc/Mix(datum/disease/advance/D)
-	if(!(src.IsSame(D)))
-		var/list/possible_symptoms = shuffle(D.symptoms)
-		for(var/datum/symptom/S in possible_symptoms)
-			AddSymptom(new S.type)
-
-/datum/disease/advance/proc/HasSymptom(datum/symptom/S)
-	for(var/datum/symptom/symp in symptoms)
-		if(symp.id == S.id)
-			return 1
-	return 0
-
-// Will generate new unique symptoms, use this if there are none. Returns a list of symptoms that were generated.
-/datum/disease/advance/proc/GenerateSymptoms(level_min, level_max, amount_get = 0)
-
-	var/list/generated = list() // Symptoms we generated.
-
-	// Generate symptoms. By default, we only choose non-deadly symptoms.
-	var/list/possible_symptoms = list()
-	for(var/symp in SSdisease.list_symptoms)
-		var/datum/symptom/S = new symp
-		if(S.level >= level_min && S.level <= level_max)
-			if(!HasSymptom(S))
-				possible_symptoms += S
-
-	if(!possible_symptoms.len)
-		return generated
-
-	// Random chance to get more than one symptom
-	var/number_of = amount_get
-	if(!amount_get)
-		number_of = 1
-		while(prob(20))
-			number_of += 1
-
-	for(var/i = 1; number_of >= i && possible_symptoms.len; i++)
-		generated += pick_n_take(possible_symptoms)
-
-	return generated
-
-/datum/disease/advance/proc/Refresh(new_name = 0)
-	//to_chat(world, "[src.name] \ref[src] - REFRESH!")
-	GenerateProperties()
-	AssignProperties()
-	id = null
-
-	if(!SSdisease.archive_diseases[GetDiseaseID()])
-		if(new_name)
-			AssignName()
-		SSdisease.archive_diseases[GetDiseaseID()] = src // So we don't infinite loop
-		SSdisease.archive_diseases[GetDiseaseID()] = new /datum/disease/advance(0, src, 1)
-
-	var/datum/disease/advance/A = SSdisease.archive_diseases[GetDiseaseID()]
-	AssignName(A.name)
-
-//Generate disease properties based on the effects. Returns an associated list.
-/datum/disease/advance/proc/GenerateProperties()
-
-	if(!symptoms || !symptoms.len)
-		CRASH("We did not have any symptoms before generating properties.")
-		return
-
-	properties = list("resistance" = 0, "stealth" = 0, "stage_rate" = 0, "transmittable" = 0, "severity" = 0)
-
-	for(var/datum/symptom/S in symptoms)
-		properties["resistance"] += S.resistance
-		properties["stealth"] += S.stealth
-		properties["stage_rate"] += S.stage_speed
-		properties["transmittable"] += S.transmittable
-		properties["severity"] = max(properties["severity"], S.severity) // severity is based on the highest severity symptom
-	return
-
-// Assign the properties that are in the list.
-/datum/disease/advance/proc/AssignProperties()
-
-	if(properties && properties.len)
-		switch(properties["stealth"])
-			if(2,3)
-				visibility_flags = HIDDEN_SCANNER
-			if(4 to INFINITY)
-				visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
-
-		// The more symptoms we have, the less transmittable it is but some symptoms can make up for it.
-		SetSpread(Clamp(2 ** (properties["transmittable"] - symptoms.len), BLOOD, AIRBORNE))
-		permeability_mod = max(Ceiling(0.4 * properties["transmittable"]), 1)
-		cure_chance = 15 - Clamp(properties["resistance"], -5, 5) // can be between 10 and 20
-		stage_prob = max(properties["stage_rate"], 2)
-		SetSeverity(properties["severity"])
-		GenerateCure(properties)
-	else
-		CRASH("Our properties were empty or null!")
-
-
-// Assign the spread type and give it the correct description.
-/datum/disease/advance/proc/SetSpread(spread_id)
-	switch(spread_id)
-		if(NON_CONTAGIOUS)
-			spread_text = "None"
-		if(SPECIAL)
-			spread_text = "None"
-		if(CONTACT_GENERAL, CONTACT_HANDS, CONTACT_FEET)
-			spread_text = "On contact"
-		if(AIRBORNE)
-			spread_text = "Airborne"
-		if(BLOOD)
-			spread_text = "Blood"
-
-	spread_flags = spread_id
-
-/datum/disease/advance/proc/SetSeverity(level_sev)
-
-	switch(level_sev)
-
-		if(-INFINITY to 0)
-			severity = NONTHREAT
-		if(1)
-			severity = MINOR
-		if(2)
-			severity = MEDIUM
-		if(3)
-			severity = HARMFUL
-		if(4)
-			severity = DANGEROUS
-		if(5 to INFINITY)
-			severity = BIOHAZARD
-		else
-			severity = "Unknown"
-
-
-// Will generate a random cure, the less resistance the symptoms have, the harder the cure.
-/datum/disease/advance/proc/GenerateCure()
-	if(properties && properties.len)
-		var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len)
-		//to_chat(world, "Res = [res]")
-		cures = list(advance_cures[res])
-
-		// Get the cure name from the cure_id
-		var/datum/reagent/D = GLOB.chemical_reagents_list[cures[1]]
-		cure_text = D.name
-
-
-	return
-
-// Randomly generate a symptom, has a chance to lose or gain a symptom.
-/datum/disease/advance/proc/Evolve(min_level, max_level)
-	var/s = safepick(GenerateSymptoms(min_level, max_level, 1))
-	if(s)
-		AddSymptom(s)
-		Refresh(1)
-	return
-
-// Randomly remove a symptom.
-/datum/disease/advance/proc/Devolve()
-	if(symptoms.len > 1)
-		var/s = safepick(symptoms)
-		if(s)
-			RemoveSymptom(s)
-			Refresh(1)
-	return
-
-// Name the disease.
-/datum/disease/advance/proc/AssignName(name = "Unknown")
-	src.name = name
-	return
-
-// Return a unique ID of the disease.
-/datum/disease/advance/GetDiseaseID()
-	if(!id)
-		var/list/L = list()
-		for(var/datum/symptom/S in symptoms)
-			L += S.id
-		L = sortList(L) // Sort the list so it doesn't matter which order the symptoms are in.
-		var/result = jointext(L, ":")
-		id = result
-	return id
-
-
-// Add a symptom, if it is over the limit (with a small chance to be able to go over)
-// we take a random symptom away and add the new one.
-/datum/disease/advance/proc/AddSymptom(datum/symptom/S)
-
-	if(HasSymptom(S))
-		return
-
-	if(symptoms.len < (SYMPTOM_LIMIT - 1) + rand(-1, 1))
-		symptoms += S
-	else
-		RemoveSymptom(pick(symptoms))
-		symptoms += S
-	return
-
-// Simply removes the symptom.
-/datum/disease/advance/proc/RemoveSymptom(datum/symptom/S)
-	symptoms -= S
-	return
-
-/*
-
-	Static Procs
-
-*/
-
-// Mix a list of advance diseases and return the mixed result.
-/proc/Advance_Mix(var/list/D_list)
-
-	//to_chat(world, "Mixing!!!!")
-
-	var/list/diseases = list()
-
-	for(var/datum/disease/advance/A in D_list)
-		diseases += A.Copy()
-
-	if(!diseases.len)
-		return null
-	if(diseases.len <= 1)
-		return pick(diseases) // Just return the only entry.
-
-	var/i = 0
-	// Mix our diseases until we are left with only one result.
-	while(i < 20 && diseases.len > 1)
-
-		i++
-
-		var/datum/disease/advance/D1 = pick(diseases)
-		diseases -= D1
-
-		var/datum/disease/advance/D2 = pick(diseases)
-		D2.Mix(D1)
-
-	 // Should be only 1 entry left, but if not let's only return a single entry
-	//to_chat(world, "END MIXING!!!!!")
-	var/datum/disease/advance/to_return = pick(diseases)
-	to_return.Refresh(1)
-	return to_return
-
-/proc/SetViruses(datum/reagent/R, list/data)
-	if(data)
-		var/list/preserve = list()
-		if(istype(data) && data["viruses"])
-			for(var/datum/disease/A in data["viruses"])
-				preserve += A.Copy()
-			R.data = data.Copy()
-		if(preserve.len)
-			R.data["viruses"] = preserve
-
-/proc/AdminCreateVirus(client/user)
-
-	if(!user)
-		return
-
-	var/i = SYMPTOM_LIMIT
-
-	var/datum/disease/advance/D = new(0, null)
-	D.symptoms = list()
-
-	var/list/symptoms = list()
-	symptoms += "Done"
-	symptoms += SSdisease.list_symptoms.Copy()
-	do
-		if(user)
-			var/symptom = input(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom") in symptoms
-			if(isnull(symptom))
-				return
-			else if(istext(symptom))
-				i = 0
-			else if(ispath(symptom))
-				var/datum/symptom/S = new symptom
-				if(!D.HasSymptom(S))
-					D.symptoms += S
-					i -= 1
-	while(i > 0)
-
-	if(D.symptoms.len > 0)
-
-		var/new_name = stripped_input(user, "Name your new disease.", "New Name")
-		if(!new_name)
-			return
-		D.AssignName(new_name)
-		D.Refresh()
-
-		for(var/datum/disease/advance/AD in SSdisease.processing)
-			AD.Refresh()
-
-		for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list))
+	Advance Disease is a system for Virologist to Engineer their own disease with symptoms that have effects and properties
+	which add onto the overall disease.
+
+	If you need help with creating new symptoms or expanding the advance disease, ask for Giacom on #coderbus.
+
+*/
+
+#define SYMPTOM_LIMIT 8
+
+
+
+/*
+
+	PROPERTIES
+
+ */
+
+/datum/disease/advance
+
+	name = "Unknown" // We will always let our Virologist name our disease.
+	desc = "An engineered disease which can contain a multitude of symptoms."
+	form = "Advance Disease" // Will let med-scanners know that this disease was engineered.
+	agent = "advance microbes"
+	max_stages = 5
+	spread_text = "Unknown"
+	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+
+	// NEW VARS
+	var/list/properties = list()
+	var/list/symptoms = list() // The symptoms of the disease.
+	var/id = ""
+	var/processing = 0
+
+	// The order goes from easy to cure to hard to cure.
+	var/static/list/advance_cures = 	list(
+									"sodiumchloride", "sugar", "orangejuice",
+									"spaceacillin", "salglu_solution", "ethanol",
+									"leporazine", "synaptizine", "lipolicide",
+									"silver", "gold"
+								)
+
+/*
+
+	OLD PROCS
+
+ */
+
+/datum/disease/advance/New(var/process = 1, var/datum/disease/advance/D)
+	if(!istype(D))
+		D = null
+	// Generate symptoms if we weren't given any.
+
+	if(!symptoms || !symptoms.len)
+
+		if(!D || !D.symptoms || !D.symptoms.len)
+			symptoms = GenerateSymptoms(0, 2)
+		else
+			for(var/datum/symptom/S in D.symptoms)
+				symptoms += new S.type
+
+	Refresh()
+	..(process, D)
+	return
+
+/datum/disease/advance/Destroy()
+	if(processing)
+		for(var/datum/symptom/S in symptoms)
+			S.End(src)
+	return ..()
+
+// Randomly pick a symptom to activate.
+/datum/disease/advance/stage_act()
+	..()
+	if(symptoms && symptoms.len)
+
+		if(!processing)
+			processing = 1
+			for(var/datum/symptom/S in symptoms)
+				S.Start(src)
+
+		for(var/datum/symptom/S in symptoms)
+			S.Activate(src)
+	else
+		CRASH("We do not have any symptoms during stage_act()!")
+
+// Compares type then ID.
+/datum/disease/advance/IsSame(datum/disease/advance/D)
+
+	if(!(istype(D, /datum/disease/advance)))
+		return 0
+
+	if(src.GetDiseaseID() != D.GetDiseaseID())
+		return 0
+	return 1
+
+// To add special resistances.
+/datum/disease/advance/cure(resistance=1)
+	if(affected_mob)
+		var/id = "[GetDiseaseID()]"
+		if(resistance && !(id in affected_mob.resistances))
+			affected_mob.resistances[id] = id
+		remove_virus()
+	qdel(src)	//delete the datum to stop it processing
+
+// Returns the advance disease with a different reference memory.
+/datum/disease/advance/Copy(process = 0)
+	return new /datum/disease/advance(process, src, 1)
+
+/*
+
+	NEW PROCS
+
+ */
+
+// Mix the symptoms of two diseases (the src and the argument)
+/datum/disease/advance/proc/Mix(datum/disease/advance/D)
+	if(!(src.IsSame(D)))
+		var/list/possible_symptoms = shuffle(D.symptoms)
+		for(var/datum/symptom/S in possible_symptoms)
+			AddSymptom(new S.type)
+
+/datum/disease/advance/proc/HasSymptom(datum/symptom/S)
+	for(var/datum/symptom/symp in symptoms)
+		if(symp.id == S.id)
+			return 1
+	return 0
+
+// Will generate new unique symptoms, use this if there are none. Returns a list of symptoms that were generated.
+/datum/disease/advance/proc/GenerateSymptoms(level_min, level_max, amount_get = 0)
+
+	var/list/generated = list() // Symptoms we generated.
+
+	// Generate symptoms. By default, we only choose non-deadly symptoms.
+	var/list/possible_symptoms = list()
+	for(var/symp in SSdisease.list_symptoms)
+		var/datum/symptom/S = new symp
+		if(S.level >= level_min && S.level <= level_max)
+			if(!HasSymptom(S))
+				possible_symptoms += S
+
+	if(!possible_symptoms.len)
+		return generated
+
+	// Random chance to get more than one symptom
+	var/number_of = amount_get
+	if(!amount_get)
+		number_of = 1
+		while(prob(20))
+			number_of += 1
+
+	for(var/i = 1; number_of >= i && possible_symptoms.len; i++)
+		generated += pick_n_take(possible_symptoms)
+
+	return generated
+
+/datum/disease/advance/proc/Refresh(new_name = 0)
+	//to_chat(world, "[src.name] \ref[src] - REFRESH!")
+	GenerateProperties()
+	AssignProperties()
+	id = null
+
+	if(!SSdisease.archive_diseases[GetDiseaseID()])
+		if(new_name)
+			AssignName()
+		SSdisease.archive_diseases[GetDiseaseID()] = src // So we don't infinite loop
+		SSdisease.archive_diseases[GetDiseaseID()] = new /datum/disease/advance(0, src, 1)
+
+	var/datum/disease/advance/A = SSdisease.archive_diseases[GetDiseaseID()]
+	AssignName(A.name)
+
+//Generate disease properties based on the effects. Returns an associated list.
+/datum/disease/advance/proc/GenerateProperties()
+
+	if(!symptoms || !symptoms.len)
+		CRASH("We did not have any symptoms before generating properties.")
+		return
+
+	properties = list("resistance" = 0, "stealth" = 0, "stage_rate" = 0, "transmittable" = 0, "severity" = 0)
+
+	for(var/datum/symptom/S in symptoms)
+		properties["resistance"] += S.resistance
+		properties["stealth"] += S.stealth
+		properties["stage_rate"] += S.stage_speed
+		properties["transmittable"] += S.transmittable
+		properties["severity"] = max(properties["severity"], S.severity) // severity is based on the highest severity symptom
+	return
+
+// Assign the properties that are in the list.
+/datum/disease/advance/proc/AssignProperties()
+
+	if(properties && properties.len)
+		switch(properties["stealth"])
+			if(2,3)
+				visibility_flags = HIDDEN_SCANNER
+			if(4 to INFINITY)
+				visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
+
+		// The more symptoms we have, the less transmittable it is but some symptoms can make up for it.
+		SetSpread(Clamp(2 ** (properties["transmittable"] - symptoms.len), BLOOD, AIRBORNE))
+		permeability_mod = max(Ceiling(0.4 * properties["transmittable"]), 1)
+		cure_chance = 15 - Clamp(properties["resistance"], -5, 5) // can be between 10 and 20
+		stage_prob = max(properties["stage_rate"], 2)
+		SetSeverity(properties["severity"])
+		GenerateCure(properties)
+	else
+		CRASH("Our properties were empty or null!")
+
+
+// Assign the spread type and give it the correct description.
+/datum/disease/advance/proc/SetSpread(spread_id)
+	switch(spread_id)
+		if(NON_CONTAGIOUS)
+			spread_text = "None"
+		if(SPECIAL)
+			spread_text = "None"
+		if(CONTACT_GENERAL, CONTACT_HANDS, CONTACT_FEET)
+			spread_text = "On contact"
+		if(AIRBORNE)
+			spread_text = "Airborne"
+		if(BLOOD)
+			spread_text = "Blood"
+
+	spread_flags = spread_id
+
+/datum/disease/advance/proc/SetSeverity(level_sev)
+
+	switch(level_sev)
+
+		if(-INFINITY to 0)
+			severity = NONTHREAT
+		if(1)
+			severity = MINOR
+		if(2)
+			severity = MEDIUM
+		if(3)
+			severity = HARMFUL
+		if(4)
+			severity = DANGEROUS
+		if(5 to INFINITY)
+			severity = BIOHAZARD
+		else
+			severity = "Unknown"
+
+
+// Will generate a random cure, the less resistance the symptoms have, the harder the cure.
+/datum/disease/advance/proc/GenerateCure()
+	if(properties && properties.len)
+		var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len)
+		//to_chat(world, "Res = [res]")
+		cures = list(advance_cures[res])
+
+		// Get the cure name from the cure_id
+		var/datum/reagent/D = GLOB.chemical_reagents_list[cures[1]]
+		cure_text = D.name
+
+
+	return
+
+// Randomly generate a symptom, has a chance to lose or gain a symptom.
+/datum/disease/advance/proc/Evolve(min_level, max_level)
+	var/s = safepick(GenerateSymptoms(min_level, max_level, 1))
+	if(s)
+		AddSymptom(s)
+		Refresh(1)
+	return
+
+// Randomly remove a symptom.
+/datum/disease/advance/proc/Devolve()
+	if(symptoms.len > 1)
+		var/s = safepick(symptoms)
+		if(s)
+			RemoveSymptom(s)
+			Refresh(1)
+	return
+
+// Name the disease.
+/datum/disease/advance/proc/AssignName(name = "Unknown")
+	src.name = name
+	return
+
+// Return a unique ID of the disease.
+/datum/disease/advance/GetDiseaseID()
+	if(!id)
+		var/list/L = list()
+		for(var/datum/symptom/S in symptoms)
+			L += S.id
+		L = sortList(L) // Sort the list so it doesn't matter which order the symptoms are in.
+		var/result = jointext(L, ":")
+		id = result
+	return id
+
+
+// Add a symptom, if it is over the limit (with a small chance to be able to go over)
+// we take a random symptom away and add the new one.
+/datum/disease/advance/proc/AddSymptom(datum/symptom/S)
+
+	if(HasSymptom(S))
+		return
+
+	if(symptoms.len < (SYMPTOM_LIMIT - 1) + rand(-1, 1))
+		symptoms += S
+	else
+		RemoveSymptom(pick(symptoms))
+		symptoms += S
+	return
+
+// Simply removes the symptom.
+/datum/disease/advance/proc/RemoveSymptom(datum/symptom/S)
+	symptoms -= S
+	return
+
+/*
+
+	Static Procs
+
+*/
+
+// Mix a list of advance diseases and return the mixed result.
+/proc/Advance_Mix(var/list/D_list)
+
+	//to_chat(world, "Mixing!!!!")
+
+	var/list/diseases = list()
+
+	for(var/datum/disease/advance/A in D_list)
+		diseases += A.Copy()
+
+	if(!diseases.len)
+		return null
+	if(diseases.len <= 1)
+		return pick(diseases) // Just return the only entry.
+
+	var/i = 0
+	// Mix our diseases until we are left with only one result.
+	while(i < 20 && diseases.len > 1)
+
+		i++
+
+		var/datum/disease/advance/D1 = pick(diseases)
+		diseases -= D1
+
+		var/datum/disease/advance/D2 = pick(diseases)
+		D2.Mix(D1)
+
+	 // Should be only 1 entry left, but if not let's only return a single entry
+	//to_chat(world, "END MIXING!!!!!")
+	var/datum/disease/advance/to_return = pick(diseases)
+	to_return.Refresh(1)
+	return to_return
+
+/proc/SetViruses(datum/reagent/R, list/data)
+	if(data)
+		var/list/preserve = list()
+		if(istype(data) && data["viruses"])
+			for(var/datum/disease/A in data["viruses"])
+				preserve += A.Copy()
+			R.data = data.Copy()
+		if(preserve.len)
+			R.data["viruses"] = preserve
+
+/proc/AdminCreateVirus(client/user)
+
+	if(!user)
+		return
+
+	var/i = SYMPTOM_LIMIT
+
+	var/datum/disease/advance/D = new(0, null)
+	D.symptoms = list()
+
+	var/list/symptoms = list()
+	symptoms += "Done"
+	symptoms += SSdisease.list_symptoms.Copy()
+	do
+		if(user)
+			var/symptom = input(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom") in symptoms
+			if(isnull(symptom))
+				return
+			else if(istext(symptom))
+				i = 0
+			else if(ispath(symptom))
+				var/datum/symptom/S = new symptom
+				if(!D.HasSymptom(S))
+					D.symptoms += S
+					i -= 1
+	while(i > 0)
+
+	if(D.symptoms.len > 0)
+
+		var/new_name = stripped_input(user, "Name your new disease.", "New Name")
+		if(!new_name)
+			return
+		D.AssignName(new_name)
+		D.Refresh()
+
+		for(var/datum/disease/advance/AD in SSdisease.processing)
+			AD.Refresh()
+
+		for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list))
 			if(H.z != ZLEVEL_STATION)
-				continue
-			if(!H.HasDisease(D))
-				H.ForceContractDisease(D)
-				break
-
-		var/list/name_symptoms = list()
-		for(var/datum/symptom/S in D.symptoms)
-			name_symptoms += S.name
-		message_admins("[key_name_admin(user)] has triggered a custom virus outbreak of [D.name]! It has these symptoms: [english_list(name_symptoms)]")
-
-/*
-/mob/verb/test()
-
-	for(var/datum/disease/D in SSdisease.processing)
-		to_chat(src, "<a href='?_src_=vars;Vars=\ref[D]'>[D.name] - [D.holder]</a>")
-*/
-
-
-/datum/disease/advance/proc/totalStageSpeed()
-	return properties["stage_rate"]
-
-/datum/disease/advance/proc/totalStealth()
-	return properties["stealth"]
-
-/datum/disease/advance/proc/totalResistance()
-	return properties["resistance"]
-
-/datum/disease/advance/proc/totalTransmittable()
-	return properties["transmittable"]
-
-#undef RANDOM_STARTING_LEVEL
+				continue
+			if(!H.HasDisease(D))
+				H.ForceContractDisease(D)
+				break
+
+		var/list/name_symptoms = list()
+		for(var/datum/symptom/S in D.symptoms)
+			name_symptoms += S.name
+		message_admins("[key_name_admin(user)] has triggered a custom virus outbreak of [D.name]! It has these symptoms: [english_list(name_symptoms)]")
+
+/*
+/mob/verb/test()
+
+	for(var/datum/disease/D in SSdisease.processing)
+		to_chat(src, "<a href='?_src_=vars;Vars=\ref[D]'>[D.name] - [D.holder]</a>")
+*/
+
+
+/datum/disease/advance/proc/totalStageSpeed()
+	return properties["stage_rate"]
+
+/datum/disease/advance/proc/totalStealth()
+	return properties["stealth"]
+
+/datum/disease/advance/proc/totalResistance()
+	return properties["resistance"]
+
+/datum/disease/advance/proc/totalTransmittable()
+	return properties["transmittable"]
+
+#undef RANDOM_STARTING_LEVEL

code/datums/diseases/advance/symptoms/deafness.dm

@@ -1,37 +1,37 @@
-/*
-//////////////////////////////////////
-
-Deafness
-
-	Slightly noticable.
-	Lowers resistance.
-	Decreases stage speed slightly.
-	Decreases transmittablity.
-	Intense Level.
-
-Bonus
-	Causes intermittent loss of hearing.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/deafness
-
-	name = "Deafness"
-	stealth = -1
-	resistance = -2
-	stage_speed = -1
-	transmittable = -3
-	level = 4
-	severity = 3
-
-/datum/symptom/deafness/Activate(datum/disease/advance/A)
-	..()
-	if(prob(SYMPTOM_ACTIVATION_PROB))
-		var/mob/living/M = A.affected_mob
-		switch(A.stage)
-			if(3, 4)
-				to_chat(M, "<span class='warning'>[pick("You hear a ringing in your ear.", "Your ears pop.")]</span>")
-			if(5)
+/*
+//////////////////////////////////////
+
+Deafness
+
+	Slightly noticable.
+	Lowers resistance.
+	Decreases stage speed slightly.
+	Decreases transmittablity.
+	Intense Level.
+
+Bonus
+	Causes intermittent loss of hearing.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/deafness
+
+	name = "Deafness"
+	stealth = -1
+	resistance = -2
+	stage_speed = -1
+	transmittable = -3
+	level = 4
+	severity = 3
+
+/datum/symptom/deafness/Activate(datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(3, 4)
+				to_chat(M, "<span class='warning'>[pick("You hear a ringing in your ear.", "Your ears pop.")]</span>")
+			if(5)
 				to_chat(M, "<span class='userdanger'>Your ears pop and begin ringing loudly!</span>")
 				M.minimumDeafTicks(20)

code/datums/diseases/advance/symptoms/heal.dm

@@ -1,288 +1,288 @@
-/*
-//////////////////////////////////////
-
-Healing
-
-	Little bit hidden.
-	Lowers resistance tremendously.
-	Decreases stage speed tremendously.
-	Decreases transmittablity temrendously.
-	Fatal Level.
-
-Bonus
-	Heals toxins in the affected mob's blood stream.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/heal
-
-	name = "Toxic Filter"
-	stealth = 1
-	resistance = -4
-	stage_speed = -4
-	transmittable = -4
-	level = 6
-
-/datum/symptom/heal/Activate(datum/disease/advance/A)
-	..()
-	 //100% chance to activate for slow but consistent healing
-	var/mob/living/M = A.affected_mob
-	switch(A.stage)
-		if(4, 5)
-			Heal(M, A)
-	return
-
-/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A)
-	var/heal_amt = 0.5
-	if(M.toxloss > 0 && prob(20))
+/*
+//////////////////////////////////////
+
+Healing
+
+	Little bit hidden.
+	Lowers resistance tremendously.
+	Decreases stage speed tremendously.
+	Decreases transmittablity temrendously.
+	Fatal Level.
+
+Bonus
+	Heals toxins in the affected mob's blood stream.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal
+
+	name = "Toxic Filter"
+	stealth = 1
+	resistance = -4
+	stage_speed = -4
+	transmittable = -4
+	level = 6
+
+/datum/symptom/heal/Activate(datum/disease/advance/A)
+	..()
+	 //100% chance to activate for slow but consistent healing
+	var/mob/living/M = A.affected_mob
+	switch(A.stage)
+		if(4, 5)
+			Heal(M, A)
+	return
+
+/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A)
+	var/heal_amt = 0.5
+	if(M.toxloss > 0 && prob(20))
 		new /obj/effect/temp_visual/heal(get_turf(M), "#66FF99")
-	M.adjustToxLoss(-heal_amt)
-	return 1
-
-/*
-//////////////////////////////////////
-
-Apoptosis
-
-	Lowers resistance.
-	Decreases stage speed.
-	Decreases transmittablity.
-
-Bonus
-	Heals toxins in the affected mob's blood stream faster.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/heal/plus
-
-	name = "Apoptoxin filter"
-	stealth = 0
-	resistance = -2
-	stage_speed = -2
-	transmittable = -2
-	level = 8
-
-/datum/symptom/heal/plus/Heal(mob/living/M, datum/disease/advance/A)
-	var/heal_amt = 1
-	if(M.toxloss > 0 && prob(20))
+	M.adjustToxLoss(-heal_amt)
+	return 1
+
+/*
+//////////////////////////////////////
+
+Apoptosis
+
+	Lowers resistance.
+	Decreases stage speed.
+	Decreases transmittablity.
+
+Bonus
+	Heals toxins in the affected mob's blood stream faster.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal/plus
+
+	name = "Apoptoxin filter"
+	stealth = 0
+	resistance = -2
+	stage_speed = -2
+	transmittable = -2
+	level = 8
+
+/datum/symptom/heal/plus/Heal(mob/living/M, datum/disease/advance/A)
+	var/heal_amt = 1
+	if(M.toxloss > 0 && prob(20))
 		new /obj/effect/temp_visual/heal(get_turf(M), "#00FF00")
-	M.adjustToxLoss(-heal_amt)
-	return 1
-
-/*
-//////////////////////////////////////
-
-Regeneration
-
-	Little bit hidden.
-	Lowers resistance tremendously.
-	Decreases stage speed tremendously.
-	Decreases transmittablity temrendously.
-	Fatal Level.
-
-Bonus
-	Heals brute damage slowly over time.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/heal/brute
-
-	name = "Regeneration"
-	stealth = 1
-	resistance = -4
-	stage_speed = -4
-	transmittable = -4
-	level = 6
-
-/datum/symptom/heal/brute/Heal(mob/living/carbon/M, datum/disease/advance/A)
-	var/heal_amt = 1
-
-	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
-
-	if(!parts.len)
-		return
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, 0))
-			M.update_damage_overlays()
-
-	if(prob(20))
+	M.adjustToxLoss(-heal_amt)
+	return 1
+
+/*
+//////////////////////////////////////
+
+Regeneration
+
+	Little bit hidden.
+	Lowers resistance tremendously.
+	Decreases stage speed tremendously.
+	Decreases transmittablity temrendously.
+	Fatal Level.
+
+Bonus
+	Heals brute damage slowly over time.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal/brute
+
+	name = "Regeneration"
+	stealth = 1
+	resistance = -4
+	stage_speed = -4
+	transmittable = -4
+	level = 6
+
+/datum/symptom/heal/brute/Heal(mob/living/carbon/M, datum/disease/advance/A)
+	var/heal_amt = 1
+
+	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
+
+	if(!parts.len)
+		return
+
+	for(var/obj/item/bodypart/L in parts)
+		if(L.heal_damage(heal_amt/parts.len, 0))
+			M.update_damage_overlays()
+
+	if(prob(20))
 		new /obj/effect/temp_visual/heal(get_turf(M), "#FF3333")
-
-	return 1
-
-
-/*
-//////////////////////////////////////
-
-Flesh Mending
-
-	No resistance change.
-	Decreases stage speed.
-	Decreases transmittablity.
-	Fatal Level.
-
-Bonus
-	Heals brute damage over time. Turns cloneloss into burn damage.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/heal/brute/plus
-
-	name = "Flesh Mending"
-	stealth = 0
-	resistance = 0
-	stage_speed = -2
-	transmittable = -2
-	level = 8
-
-/datum/symptom/heal/brute/plus/Heal(mob/living/carbon/M, datum/disease/advance/A)
-	var/heal_amt = 2
-
-	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
-
-	if(M.getCloneLoss() > 0)
-		M.adjustCloneLoss(-1)
-		M.take_bodypart_damage(0, 1) //Deals BURN damage, which is not cured by this symptom
+
+	return 1
+
+
+/*
+//////////////////////////////////////
+
+Flesh Mending
+
+	No resistance change.
+	Decreases stage speed.
+	Decreases transmittablity.
+	Fatal Level.
+
+Bonus
+	Heals brute damage over time. Turns cloneloss into burn damage.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal/brute/plus
+
+	name = "Flesh Mending"
+	stealth = 0
+	resistance = 0
+	stage_speed = -2
+	transmittable = -2
+	level = 8
+
+/datum/symptom/heal/brute/plus/Heal(mob/living/carbon/M, datum/disease/advance/A)
+	var/heal_amt = 2
+
+	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
+
+	if(M.getCloneLoss() > 0)
+		M.adjustCloneLoss(-1)
+		M.take_bodypart_damage(0, 1) //Deals BURN damage, which is not cured by this symptom
 		new /obj/effect/temp_visual/heal(get_turf(M), "#33FFCC")
-
-	if(!parts.len)
-		return
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, 0))
-			M.update_damage_overlays()
-
-	if(prob(20))
+
+	if(!parts.len)
+		return
+
+	for(var/obj/item/bodypart/L in parts)
+		if(L.heal_damage(heal_amt/parts.len, 0))
+			M.update_damage_overlays()
+
+	if(prob(20))
 		new /obj/effect/temp_visual/heal(get_turf(M), "#CC1100")
-
-	return 1
-
-/*
-//////////////////////////////////////
-
-Tissue Regrowth
-
-	Little bit hidden.
-	Lowers resistance tremendously.
-	Decreases stage speed tremendously.
-	Decreases transmittablity temrendously.
-	Fatal Level.
-
-Bonus
-	Heals burn damage slowly over time.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/heal/burn
-
-	name = "Tissue Regrowth"
-	stealth = 1
-	resistance = -4
-	stage_speed = -4
-	transmittable = -4
-	level = 6
-
-/datum/symptom/heal/burn/Heal(mob/living/carbon/M, datum/disease/advance/A)
-	var/heal_amt = 1
-
-	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
-
-	if(!parts.len)
-		return
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(0, heal_amt/parts.len))
-			M.update_damage_overlays()
-
-	if(prob(20))
+
+	return 1
+
+/*
+//////////////////////////////////////
+
+Tissue Regrowth
+
+	Little bit hidden.
+	Lowers resistance tremendously.
+	Decreases stage speed tremendously.
+	Decreases transmittablity temrendously.
+	Fatal Level.
+
+Bonus
+	Heals burn damage slowly over time.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal/burn
+
+	name = "Tissue Regrowth"
+	stealth = 1
+	resistance = -4
+	stage_speed = -4
+	transmittable = -4
+	level = 6
+
+/datum/symptom/heal/burn/Heal(mob/living/carbon/M, datum/disease/advance/A)
+	var/heal_amt = 1
+
+	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
+
+	if(!parts.len)
+		return
+
+	for(var/obj/item/bodypart/L in parts)
+		if(L.heal_damage(0, heal_amt/parts.len))
+			M.update_damage_overlays()
+
+	if(prob(20))
 		new /obj/effect/temp_visual/heal(get_turf(M), "#FF9933")
-	return 1
-
-
-/*
-//////////////////////////////////////
-
-Heat Resistance //Needs a better name
-
-	No resistance change.
-	Decreases stage speed.
-	Decreases transmittablity.
-	Fatal Level.
-
-Bonus
-	Heals burn damage over time, and helps stabilize body temperature.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/heal/burn/plus
-
-	name = "Heat Resistance"
-	stealth = 0
-	resistance = 0
-	stage_speed = -2
-	transmittable = -2
-	level = 8
-
-/datum/symptom/heal/burn/plus/Heal(mob/living/carbon/M, datum/disease/advance/A)
-	var/heal_amt = 2
-
-	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
-
-	if(M.bodytemperature > 310)
-		M.bodytemperature = max(310, M.bodytemperature - (10 * heal_amt * TEMPERATURE_DAMAGE_COEFFICIENT))
-	else if(M.bodytemperature < 311)
-		M.bodytemperature = min(310, M.bodytemperature + (10 * heal_amt * TEMPERATURE_DAMAGE_COEFFICIENT))
-
-	if(!parts.len)
-		return
-
-	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(0, heal_amt/parts.len))
-			M.update_damage_overlays()
-
-	if(prob(20))
+	return 1
+
+
+/*
+//////////////////////////////////////
+
+Heat Resistance //Needs a better name
+
+	No resistance change.
+	Decreases stage speed.
+	Decreases transmittablity.
+	Fatal Level.
+
+Bonus
+	Heals burn damage over time, and helps stabilize body temperature.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal/burn/plus
+
+	name = "Heat Resistance"
+	stealth = 0
+	resistance = 0
+	stage_speed = -2
+	transmittable = -2
+	level = 8
+
+/datum/symptom/heal/burn/plus/Heal(mob/living/carbon/M, datum/disease/advance/A)
+	var/heal_amt = 2
+
+	var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
+
+	if(M.bodytemperature > 310)
+		M.bodytemperature = max(310, M.bodytemperature - (10 * heal_amt * TEMPERATURE_DAMAGE_COEFFICIENT))
+	else if(M.bodytemperature < 311)
+		M.bodytemperature = min(310, M.bodytemperature + (10 * heal_amt * TEMPERATURE_DAMAGE_COEFFICIENT))
+
+	if(!parts.len)
+		return
+
+	for(var/obj/item/bodypart/L in parts)
+		if(L.heal_damage(0, heal_amt/parts.len))
+			M.update_damage_overlays()
+
+	if(prob(20))
 		new /obj/effect/temp_visual/heal(get_turf(M), "#CC6600")
-	return 1
-
-
-/*
-//////////////////////////////////////
-
-	DNA Restoration
-
-	Not well hidden.
-	Lowers resistance minorly.
-	Does not affect stage speed.
-	Decreases transmittablity greatly.
-	Very high level.
-
-Bonus
-	Heals brain damage, treats radiation, cleans SE of non-power mutations.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/heal/dna
-
-	name = "Deoxyribonucleic Acid Restoration"
-	stealth = -1
-	resistance = -1
-	stage_speed = 0
-	transmittable = -3
-	level = 5
-
-/datum/symptom/heal/dna/Heal(mob/living/carbon/M, datum/disease/advance/A)
-	var/amt_healed = 1
-	M.adjustBrainLoss(-amt_healed)
-	//Non-power mutations, excluding race, so the virus does not force monkey -> human transformations.
-	var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations) - GLOB.mutations_list[RACEMUT]
-	M.dna.remove_mutation_group(unclean_mutations)
-	M.radiation = max(M.radiation - (2 * amt_healed), 0)
-	return 1
+	return 1
+
+
+/*
+//////////////////////////////////////
+
+	DNA Restoration
+
+	Not well hidden.
+	Lowers resistance minorly.
+	Does not affect stage speed.
+	Decreases transmittablity greatly.
+	Very high level.
+
+Bonus
+	Heals brain damage, treats radiation, cleans SE of non-power mutations.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/heal/dna
+
+	name = "Deoxyribonucleic Acid Restoration"
+	stealth = -1
+	resistance = -1
+	stage_speed = 0
+	transmittable = -3
+	level = 5
+
+/datum/symptom/heal/dna/Heal(mob/living/carbon/M, datum/disease/advance/A)
+	var/amt_healed = 1
+	M.adjustBrainLoss(-amt_healed)
+	//Non-power mutations, excluding race, so the virus does not force monkey -> human transformations.
+	var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations) - GLOB.mutations_list[RACEMUT]
+	M.dna.remove_mutation_group(unclean_mutations)
+	M.radiation = max(M.radiation - (2 * amt_healed), 0)
+	return 1

code/datums/diseases/advance/symptoms/sensory.dm

@@ -125,4 +125,4 @@ Bonus
 		if(12 to 24)
 			M.drowsyness += 1
 		if(24 to INFINITY)
-			M.Sleeping(2, 0)
+			M.Sleeping(40)

code/datums/diseases/advance/symptoms/vision.dm

@@ -29,6 +29,9 @@ Bonus
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob
+		var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
+		if (!eyes)
+			return	
 		switch(A.stage)
 			if(1, 2)
 				to_chat(M, "<span class='warning'>Your eyes itch.</span>")
@@ -40,9 +43,9 @@ Bonus
 				to_chat(M, "<span class='userdanger'>Your eyes burn horrificly!</span>")
 				M.blur_eyes(20)
 				M.adjust_eye_damage(5)
-				if(M.eye_damage >= 10)
+				if(eyes.eye_damage >= 10)
 					M.become_nearsighted()
-					if(prob(M.eye_damage - 10 + 1))
+					if(prob(eyes.eye_damage - 10 + 1))
 						if(M.become_blind())
 							to_chat(M, "<span class='userdanger'>You go blind!</span>")
 
@@ -76,6 +79,9 @@ Bonus
 /datum/symptom/visionaid/Activate(datum/disease/advance/A)
 	..()
 	var/mob/living/M = A.affected_mob
+	var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
+	if (!eyes)
+		return
 	switch(A.stage)
 		if(4, 5) //basically oculine
 			if(M.disabilities & BLIND)
@@ -93,7 +99,7 @@ Bonus
 				else if(M.eye_blind || M.eye_blurry)
 					M.set_blindness(0)
 					M.set_blurriness(0)
-				else if(M.eye_damage > 0)
+				else if(eyes.eye_damage > 0)
 					M.adjust_eye_damage(-1)
 		else
 			if(prob(SYMPTOM_ACTIVATION_PROB * 3))

code/datums/diseases/advance/symptoms/vomit.dm

@@ -1,106 +1,106 @@
-/*
-//////////////////////////////////////
-
-Vomiting
-
-	Very Very Noticable.
-	Decreases resistance.
-	Doesn't increase stage speed.
-	Little transmittable.
-	Medium Level.
-
-Bonus
-	Forces the affected mob to vomit!
-	Meaning your disease can spread via
-	people walking on vomit.
-	Makes the affected mob lose nutrition and
-	heal toxin damage.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/vomit
-
-	name = "Vomiting"
-	stealth = -2
-	resistance = -1
-	stage_speed = 0
-	transmittable = 1
-	level = 3
-	severity = 4
-
-/datum/symptom/vomit/Activate(datum/disease/advance/A)
-	..()
-	if(prob(SYMPTOM_ACTIVATION_PROB / 2))
-		var/mob/living/M = A.affected_mob
-		switch(A.stage)
-			if(1, 2, 3, 4)
-				to_chat(M, "<span class='warning'>[pick("You feel nauseous.", "You feel like you're going to throw up!")]</span>")
-			else
-				Vomit(M)
-
-	return
-
-/datum/symptom/vomit/proc/Vomit(mob/living/carbon/M)
+/*
+//////////////////////////////////////
+
+Vomiting
+
+	Very Very Noticable.
+	Decreases resistance.
+	Doesn't increase stage speed.
+	Little transmittable.
+	Medium Level.
+
+Bonus
+	Forces the affected mob to vomit!
+	Meaning your disease can spread via
+	people walking on vomit.
+	Makes the affected mob lose nutrition and
+	heal toxin damage.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/vomit
+
+	name = "Vomiting"
+	stealth = -2
+	resistance = -1
+	stage_speed = 0
+	transmittable = 1
+	level = 3
+	severity = 4
+
+/datum/symptom/vomit/Activate(datum/disease/advance/A)
+	..()
+	if(prob(SYMPTOM_ACTIVATION_PROB / 2))
+		var/mob/living/M = A.affected_mob
+		switch(A.stage)
+			if(1, 2, 3, 4)
+				to_chat(M, "<span class='warning'>[pick("You feel nauseous.", "You feel like you're going to throw up!")]</span>")
+			else
+				Vomit(M)
+
+	return
+
+/datum/symptom/vomit/proc/Vomit(mob/living/carbon/M)
 	M.vomit(20)
-
-/*
-//////////////////////////////////////
-
-Vomiting Blood
-
-	Very Very Noticable.
-	Decreases resistance.
-	Decreases stage speed.
-	Little transmittable.
-	Intense level.
-
-Bonus
-	Forces the affected mob to vomit blood!
-	Meaning your disease can spread via
-	people walking on the blood.
-	Makes the affected mob lose health.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/vomit/blood
-
-	name = "Blood Vomiting"
-	stealth = -2
-	resistance = -1
-	stage_speed = -1
-	transmittable = 1
-	level = 4
-	severity = 5
-
-/datum/symptom/vomit/blood/Vomit(mob/living/carbon/M)
+
+/*
+//////////////////////////////////////
+
+Vomiting Blood
+
+	Very Very Noticable.
+	Decreases resistance.
+	Decreases stage speed.
+	Little transmittable.
+	Intense level.
+
+Bonus
+	Forces the affected mob to vomit blood!
+	Meaning your disease can spread via
+	people walking on the blood.
+	Makes the affected mob lose health.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/vomit/blood
+
+	name = "Blood Vomiting"
+	stealth = -2
+	resistance = -1
+	stage_speed = -1
+	transmittable = 1
+	level = 4
+	severity = 5
+
+/datum/symptom/vomit/blood/Vomit(mob/living/carbon/M)
 	M.vomit(0,TRUE)
-
-
-/*
-//////////////////////////////////////
-
-Projectile Vomiting
-
-	Very Very Noticable.
-	Decreases resistance.
-	Doesn't increase stage speed.
-	Little transmittable.
-	Medium Level.
-
-Bonus
-	As normal vomiting, except it will spread further,
-	likely causing more to walk across the vomit.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/vomit/projectile
-
-	name = "Projectile Vomiting"
-	stealth = -2
-	level = 4
-
-/datum/symptom/vomit/projectile/Vomit(mob/living/carbon/M)
+
+
+/*
+//////////////////////////////////////
+
+Projectile Vomiting
+
+	Very Very Noticable.
+	Decreases resistance.
+	Doesn't increase stage speed.
+	Little transmittable.
+	Medium Level.
+
+Bonus
+	As normal vomiting, except it will spread further,
+	likely causing more to walk across the vomit.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/vomit/projectile
+
+	name = "Projectile Vomiting"
+	stealth = -2
+	level = 4
+
+/datum/symptom/vomit/projectile/Vomit(mob/living/carbon/M)
 	M.vomit(6, distance = 5)

code/datums/diseases/advance/symptoms/weakness.dm

@@ -40,5 +40,5 @@ Bonus
 				M.adjustStaminaLoss(30)
 				if(M.getStaminaLoss() > 60 && !M.stat)
 					M.visible_message("<span class='warning'>[M] faints!</span>", "<span class='userdanger'>You swoon and faint...</span>")
-					M.AdjustSleeping(5)
+					M.AdjustSleeping(100)
 	return

code/datums/diseases/appendicitis.dm

@@ -1,34 +1,34 @@
-/datum/disease/appendicitis
-	form = "Condition"
-	name = "Appendicitis"
-	max_stages = 3
-	cure_text = "Surgery"
-	agent = "Shitty Appendix"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	permeability_mod = 1
-	desc = "If left untreated the subject will become very weak, and may vomit often."
-	severity = "Dangerous!"
-	longevity = 1000
-	disease_flags = CAN_CARRY|CAN_RESIST
-	spread_flags = NON_CONTAGIOUS
-	visibility_flags = HIDDEN_PANDEMIC
-	required_organs = list(/obj/item/organ/appendix)
-
-/datum/disease/appendicitis/stage_act()
-	..()
-	switch(stage)
-		if(1)
-			if(prob(5))
-				affected_mob.emote("cough")
-		if(2)
-			var/obj/item/organ/appendix/A = affected_mob.getorgan(/obj/item/organ/appendix)
-			if(A)
-				A.inflamed = 1
-				A.update_icon()
-			if(prob(3))
-				to_chat(affected_mob, "<span class='warning'>You feel a stabbing pain in your abdomen!</span>")
-				affected_mob.Stun(rand(2,3))
-				affected_mob.adjustToxLoss(1)
-		if(3)
-			if(prob(1))
+/datum/disease/appendicitis
+	form = "Condition"
+	name = "Appendicitis"
+	max_stages = 3
+	cure_text = "Surgery"
+	agent = "Shitty Appendix"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	permeability_mod = 1
+	desc = "If left untreated the subject will become very weak, and may vomit often."
+	severity = "Dangerous!"
+	longevity = 1000
+	disease_flags = CAN_CARRY|CAN_RESIST
+	spread_flags = NON_CONTAGIOUS
+	visibility_flags = HIDDEN_PANDEMIC
+	required_organs = list(/obj/item/organ/appendix)
+
+/datum/disease/appendicitis/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(prob(5))
+				affected_mob.emote("cough")
+		if(2)
+			var/obj/item/organ/appendix/A = affected_mob.getorgan(/obj/item/organ/appendix)
+			if(A)
+				A.inflamed = 1
+				A.update_icon()
+			if(prob(3))
+				to_chat(affected_mob, "<span class='warning'>You feel a stabbing pain in your abdomen!</span>")
+				affected_mob.Stun(rand(40,60))
+				affected_mob.adjustToxLoss(1)
+		if(3)
+			if(prob(1))
 				affected_mob.vomit(95)

code/datums/diseases/brainrot.dm

@@ -50,7 +50,7 @@
 			if(prob(3))
 				to_chat(affected_mob, "<span class='danger'>You lose consciousness...</span>")
 				affected_mob.visible_message("<span class='warning'>[affected_mob] suddenly collapses</span>")
-				affected_mob.Paralyse(rand(5,10))
+				affected_mob.Unconscious(rand(100,200))
 				if(prob(1))
 					affected_mob.emote("snore")
 			if(prob(15))

code/datums/diseases/retrovirus.dm

@@ -52,7 +52,7 @@
 				to_chat(affected_mob, "You feel very strange.")
 			if (prob(4))
 				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head!</span>")
-				affected_mob.Paralyse(2)
+				affected_mob.Unconscious(40)
 			if (prob(4))
 				to_chat(affected_mob, "<span class='danger'>Your stomach churns.</span>")
 		if(3)

code/datums/diseases/transformation.dm

@@ -138,7 +138,7 @@
 				affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
 			if (prob(4))
 				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
-				affected_mob.Paralyse(2)
+				affected_mob.Unconscious(40)
 		if(4)
 			if (prob(20))
 				affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."))
@@ -167,7 +167,7 @@
 		if(3)
 			if (prob(4))
 				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
-				affected_mob.Paralyse(2)
+				affected_mob.Unconscious(40)
 		if(4)
 			if (prob(20))
 				affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"))

code/datums/diseases/tuberculosis.dm

@@ -41,7 +41,7 @@
 			if(prob(10))
 				affected_mob.adjustStaminaLoss(100)
 				affected_mob.visible_message("<span class='warning'>[affected_mob] faints!</span>", "<span class='userdanger'>You surrender yourself and feel at peace...</span>")
-				affected_mob.AdjustSleeping(5)
+				affected_mob.AdjustSleeping(100)
 			if(prob(2))
 				to_chat(affected_mob, "<span class='userdanger'>You feel your mind relax and your thoughts drift!</span>")
 				affected_mob.confused = min(100, affected_mob.confused + 8)