Pass 1 of renaming disease/advanced

code/datums/components/cleaner.dm

@@ -128,7 +128,7 @@
 		if(isitem(target))
 			var/obj/item/item= target
 			if(length(item.viruses))
-				for(var/datum/disease/advanced/D as anything in item.viruses)
+				for(var/datum/disease/acute/D as anything in item.viruses)
 					item.remove_disease(D)
 
 	on_cleaned_callback?.Invoke(source, target, user, clean_succeeded)

code/datums/components/infective.dm

@@ -130,5 +130,5 @@
 		var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
 		var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
 		if(length(contact) && !block)
-			for(var/datum/disease/advanced/V as anything in contact)
+			for(var/datum/disease/acute/V as anything in contact)
 				living.try_contact_infect(V, note="(Skin Contact - (Infective Component), coming from [src.parent])")

code/datums/components/rot.dm

@@ -152,7 +152,7 @@
 		return
 
 	//We're running just under the "worst disease", since we don't want these to be too strong
-	var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
+	var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
 	var/list/anti = list(
 		ANTIGEN_BLOOD	= 2,
 		ANTIGEN_COMMON	= 2,
@@ -167,7 +167,7 @@
 		EFFECT_DANGER_HARMFUL	= 0,
 		EFFECT_DANGER_DEADLY	= 0,
 	)
-	var/datum/disease/advanced/disease = new virus_choice
+	var/datum/disease/acute/disease = new virus_choice
 	disease.makerandom(list(20,50),list(30,50),anti,bad,src)
 
 	var/note = "Rot Infection Contact [key_name(react_to)]"

code/datums/wounds/slash.dm

@@ -215,7 +215,7 @@
 /datum/wound/slash/flesh/proc/lick_wounds(mob/living/carbon/human/user)
 	// transmission is one way patient -> felinid since google said cat saliva is antiseptic or whatever, and also because felinids are already risking getting beaten for this even without people suspecting they're spreading a deathvirus
 	for(var/i in victim.diseases)
-		var/datum/disease/advanced/iter_disease = i
+		var/datum/disease/acute/iter_disease = i
 		if(iter_disease.spread_flags & (DISEASE_SPREAD_SPECIAL | DISEASE_SPREAD_NON_CONTAGIOUS))
 			continue
 		user.infect_disease(iter_disease, notes = "Spread via Licking (Blood)")

code/game/objects/items/devices/scanners/health_analyzer.dm

@@ -758,8 +758,8 @@
 
 	var/list/render = list()
 	for(var/datum/disease/disease as anything in patient.diseases)
-		if(istype(disease, /datum/disease/advanced))
-			var/datum/disease/advanced/advanced = disease
+		if(istype(disease, /datum/disease/acute))
+			var/datum/disease/acute/advanced = disease
 			if(!(disease.visibility_flags & HIDDEN_SCANNER))
 				render += "<span class='alert ml-1'><b>Warning: [advanced.origin] disease detected</b>\n\
 				<div class='ml-2'>Name: [advanced.real_name()].\nType: [disease.get_spread_string()].\nStage: [disease.stage]/[disease.max_stages].</div>\

code/game/objects/items/dice.dm

@@ -382,7 +382,7 @@
 		if(9)
 			//Cold
 			selected_turf.visible_message(span_userdanger("[user] looks a little under the weather!"))
-			var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
+			var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
 			var/list/anti = list(
 				ANTIGEN_BLOOD	= 1,
 				ANTIGEN_COMMON	= 1,
@@ -397,7 +397,7 @@
 				EFFECT_DANGER_HARMFUL	= 1,
 				EFFECT_DANGER_DEADLY	= 0,
 				)
-			var/datum/disease/advanced/new_disease = new virus_choice
+			var/datum/disease/acute/new_disease = new virus_choice
 			new_disease.makerandom(list(50,90),list(50,100),anti,bad,src)
 			user.infect_disease(new_disease, TRUE, "(Die of Fate 7)")
 

code/game/objects/items/food/snacks.dm

@@ -42,7 +42,7 @@
 
 /obj/item/food/candy/bronx/proc/after_eat(mob/living/eater)
 	if(ishuman(eater))
-		var/datum/disease/advanced/parasite/disease = new
+		var/datum/disease/acute/parasite/disease = new
 		var/list/anti = list(
 			ANTIGEN_BLOOD	= 1,
 			ANTIGEN_COMMON	= 1,

code/game/objects/structures/shower.dm

@@ -248,7 +248,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
 	if(isitem(target))
 		var/obj/item/item = target
 		if(length(item.viruses))
-			for(var/datum/disease/advanced/D as anything in item.viruses)
+			for(var/datum/disease/acute/D as anything in item.viruses)
 				item.remove_disease(D)
 	if(isliving(target))
 		var/mob/living/living_target = target

code/modules/admin/verbs/secrets.dm

@@ -102,7 +102,7 @@ GLOBAL_DATUM(everyone_an_antag, /datum/everyone_is_an_antag_controller)
 						continue
 					if(!length(living.diseases))
 						continue
-					for(var/datum/disease/advanced/disease as anything in living.diseases)
+					for(var/datum/disease/acute/disease as anything in living.diseases)
 						disease.cure(target = living)
 
 		if("list_bombers")

code/modules/antagonists/abductor/equipment/glands/viral.dm

@@ -24,8 +24,8 @@
 		EFFECT_DANGER_HARMFUL	= 0,
 		EFFECT_DANGER_DEADLY	= 0,
 	)
-	var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
-	var/datum/disease/advanced/D = new virus_choice
+	var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
+	var/datum/disease/acute/D = new virus_choice
 
 	D.makerandom(list(30,55),list(0,50),anti,bad,null)
 

code/modules/events/disease_outbreak.dm

@@ -109,7 +109,7 @@
 	afflicted += disease_event.disease_candidates
 	disease_event.disease_candidates.Cut() //Clean the list after use
 
-	var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
+	var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
 	var/list/anti = list(
 		ANTIGEN_BLOOD	= 1,
 		ANTIGEN_COMMON	= 1,
@@ -124,7 +124,7 @@
 		EFFECT_DANGER_HARMFUL	= 0,
 		EFFECT_DANGER_DEADLY	= 0,
 		)
-	var/datum/disease/advanced/new_disease = new virus_choice
+	var/datum/disease/acute/new_disease = new virus_choice
 	new_disease.makerandom(list(30,60),list(50,100),anti,bad,src)
 	new_disease.carrier = TRUE
 	illness_type = new_disease.name
@@ -218,7 +218,7 @@
 	afflicted += disease_event.disease_candidates
 	disease_event.disease_candidates.Cut()
 
-	var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
+	var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
 	var/list/anti = list(
 		ANTIGEN_BLOOD	= 1,
 		ANTIGEN_COMMON	= 1,
@@ -233,7 +233,7 @@
 		EFFECT_DANGER_HARMFUL	= 3,
 		EFFECT_DANGER_DEADLY	= 1,
 		)
-	var/datum/disease/advanced/new_disease = new virus_choice
+	var/datum/disease/acute/new_disease = new virus_choice
 	new_disease.makerandom(list(50,90),list(50,100),anti,bad,src)
 	new_disease.carrier = TRUE
 	illness_type = new_disease.name

code/modules/jobs/job_types/_job.dm

@@ -174,7 +174,7 @@
 			spawned_human.mind.adjust_experience(i, roundstart_experience[i], TRUE)
 
 	if(prob(25))
-		var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
+		var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
 		var/list/anti = list(
 			ANTIGEN_BLOOD	= 2,
 			ANTIGEN_COMMON	= 2,
@@ -189,7 +189,7 @@
 			EFFECT_DANGER_HARMFUL	= 2,
 			EFFECT_DANGER_DEADLY	= 2,
 		)
-		var/datum/disease/advanced/disease = new virus_choice
+		var/datum/disease/acute/disease = new virus_choice
 		disease.makerandom(list(50,90),list(10,100),anti,bad,src)
 
 		disease.disease_flags |= DISEASE_DORMANT

code/modules/mob/living/carbon/carbon_defense.dm

@@ -195,7 +195,7 @@
 		var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
 		var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
 		if(length(contact) && !block)
-			for(var/datum/disease/advanced/V as anything in contact)
+			for(var/datum/disease/acute/V as anything in contact)
 				living.infect_disease(V, notes="(Skin Contact - (Bump), coming from [src])")
 
 	if(isliving(user))
@@ -204,7 +204,7 @@
 		if(length(living.diseases))
 			var/list/contact = filter_disease_by_spread(living.diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
 			if(length(contact) && !block)
-				for(var/datum/disease/advanced/V as anything in contact)
+				for(var/datum/disease/acute/V as anything in contact)
 					infect_disease(V, notes="(Skin Contact - (Bump), coming from [living])")
 
 

code/modules/mob/living/living.dm

@@ -103,7 +103,7 @@
 		var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
 		var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
 		if(length(contact) && !block)
-			for(var/datum/disease/advanced/V as anything in contact)
+			for(var/datum/disease/acute/V as anything in contact)
 				living.infect_disease(V, notes="(Skin Contact - (Bump), coming from [src])")
 
 	if(isliving(M))
@@ -112,7 +112,7 @@
 		if(length(living.diseases))
 			var/list/contact = filter_disease_by_spread(living.diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
 			if(length(contact) && !block)
-				for(var/datum/disease/advanced/V as anything in contact)
+				for(var/datum/disease/acute/V as anything in contact)
 					infect_disease(V, notes="(Skin Contact - (Bump), coming from [living])")
 
 	SEND_SIGNAL(src, COMSIG_LIVING_MOB_BUMP, M)
@@ -399,7 +399,7 @@
 				var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
 				var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
 				if(length(contact) && !block)
-					for(var/datum/disease/advanced/V as anything in contact)
+					for(var/datum/disease/acute/V as anything in contact)
 						living.infect_disease(V, notes="(Skin Contact - (Grab), coming from [src])")
 
 			if(isliving(M))
@@ -408,7 +408,7 @@
 				if(length(living.diseases))
 					var/list/contact = filter_disease_by_spread(living.diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
 					if(length(contact) && !block)
-						for(var/datum/disease/advanced/V as anything in contact)
+						for(var/datum/disease/acute/V as anything in contact)
 							infect_disease(V, notes="(Skin Contact - (Grab), coming from [living])")
 
 			if(iscarbon(L))

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -42,8 +42,8 @@
 /datum/reagent/blood/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message=TRUE, touch_protection=0)
 	. = ..()
 	for(var/datum/disease/strain as anything in data?["viruses"])
-		if(istype(strain, /datum/disease/advanced))
-			var/datum/disease/advanced/advanced = strain
+		if(istype(strain, /datum/disease/acute))
+			var/datum/disease/acute/advanced = strain
 			if(methods & (INJECT|INGEST|PATCH))
 				exposed_mob.infect_disease(advanced, TRUE, "(Contact, splashed with infected blood)")
 			if((methods & (TOUCH | VAPOR)) && (advanced.spread_flags & DISEASE_SPREAD_BLOOD))

monkestation/code/modules/can_spessmen_feel_pain/pain/shock.dm

@@ -1,5 +1,5 @@
 // -- Shock from too much pain. --
-/datum/disease/advanced/premade/shock
+/datum/disease/acute/premade/shock
 	form = "Condition"
 	name = "Shock"
 	spread_text = "Neurogenic" // Only model pain shock
@@ -22,7 +22,7 @@
 	/// How many conditions do we need to not get a heart attack?
 	var/conditions_required_to_maintain = 3
 
-/datum/disease/advanced/premade/shock/after_add()
+/datum/disease/acute/premade/shock/after_add()
 	affected_mob.apply_status_effect(/datum/status_effect/low_blood_pressure)
 	affected_mob.set_pain_mod(type, 1.2)
 	antigen = null
@@ -32,7 +32,7 @@
  *
  * returns the total number of conditions we fulfill.
  */
-/datum/disease/advanced/premade/shock/proc/check_cure_conditions()
+/datum/disease/acute/premade/shock/proc/check_cure_conditions()
 	if(!ishuman(affected_mob))
 		return TRUE
 	var/mob/living/carbon/human = affected_mob
@@ -85,12 +85,12 @@
 
 	return conditions_fulfilled
 
-/datum/disease/advanced/premade/shock/cure(add_resistance, mob/living/carbon/target)
+/datum/disease/acute/premade/shock/cure(add_resistance, mob/living/carbon/target)
 	affected_mob.remove_status_effect(/datum/status_effect/low_blood_pressure)
 	affected_mob.unset_pain_mod(type)
 	return ..()
 
-/datum/disease/advanced/premade/shock/activate(seconds_per_tick, times_fired)
+/datum/disease/acute/premade/shock/activate(seconds_per_tick, times_fired)
 	. = ..()
 	if(!ishuman(affected_mob))
 		return

monkestation/code/modules/virology/__effects.dm

@@ -7,7 +7,7 @@
 	mouse_opacity = 1
 	layer = OBJ_LAYER
 	var/last_openner
-	var/datum/disease/advanced/contained_virus
+	var/datum/disease/acute/contained_virus
 
 /obj/effect/decal/cleanable/virusdish/Entered(mob/living/perp)
 	..()
@@ -24,7 +24,7 @@
 		block = perp.check_contact_sterility(BODY_ZONE_LEGS)
 		bleeding = perp.check_bodypart_bleeding(BODY_ZONE_LEGS)
 
-		
+
 	if (!block && contained_virus.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
 		perp.infect_disease(contained_virus, notes="(Contact, from [(perp.body_position & LYING_DOWN)?"lying":"standing"] over a broken virus dish[last_openner ? " broken by [last_openner]" : ""])")
 	else if (bleeding && (contained_virus.spread_flags & DISEASE_SPREAD_BLOOD))

monkestation/code/modules/virology/disease/base_disease_folder/_base.dm

@@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(virusDB, list())
 
 	return list(lowest_stage,highest_concentration)
 
-/datum/disease/advanced/cure(add_resistance = TRUE, mob/living/carbon/target)
+/datum/disease/acute/cure(add_resistance = TRUE, mob/living/carbon/target)
 	target = target || affected_mob || usr
 	if(!istype(affected_mob) || QDELING(affected_mob))
 		return
@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(virusDB, list())
 		ticks = 0
 
 	//Pathogen killing each others
-	for (var/datum/disease/advanced/enemy_pathogen as anything in mob.diseases)
+	for (var/datum/disease/acute/enemy_pathogen as anything in mob.diseases)
 		if(enemy_pathogen == src)
 			continue
 

monkestation/code/modules/virology/disease/base_disease_folder/admin.dm

@@ -2,12 +2,12 @@
 	if(!istype(C) || !C.holder)
 		return 0
 
-	var/datum/disease/advanced/D = new /datum/disease/advanced()
+	var/datum/disease/acute/D = new /datum/disease/acute()
 	D.origin = "Badmin"
 
 	var/list/known_forms = list()
-	for (var/disease_type in subtypesof(/datum/disease/advanced))
-		var/datum/disease/advanced/d_type = disease_type
+	for (var/disease_type in subtypesof(/datum/disease/acute))
+		var/datum/disease/acute/d_type = disease_type
 		known_forms[initial(d_type.form)] = d_type
 
 	known_forms += "custom"
@@ -24,13 +24,13 @@
 
 	if (chosen_form == "infect with an already existing pathogen")
 		var/list/existing_pathogen = list()
-		for(var/datum/disease/advanced/dis as anything in GLOB.inspectable_diseases)
+		for(var/datum/disease/acute/dis as anything in GLOB.inspectable_diseases)
 			existing_pathogen += dis
 		var/chosen_pathogen = input(C, "Choose a pathogen", "Choose a pathogen") as null | anything in existing_pathogen
 		if (!chosen_pathogen)
 			qdel(D)
 			return
-		var/datum/disease/advanced/dis = chosen_pathogen
+		var/datum/disease/acute/dis = chosen_pathogen
 		D = dis.Copy()
 		D.origin = "[D.origin] (Badmin)"
 	else
@@ -52,7 +52,7 @@
 			//D.can_kill = something something a while loop but probably not worth the effort. If you need it for your bus code it yourself.
 		else
 			var/d_type = known_forms[chosen_form]
-			var/datum/disease/advanced/d_inst = new d_type
+			var/datum/disease/acute/d_inst = new d_type
 			D.form = chosen_form
 			D.max_stages = d_inst.max_stages
 			D.infectionchance = d_inst.infectionchance
@@ -229,7 +229,7 @@
 		var/infctd_items = 0
 		var/dishes = 0
 		for (var/mob/living/L in GLOB.mob_list)
-			for(var/datum/disease/advanced/D as anything in L.diseases)
+			for(var/datum/disease/acute/D as anything in L.diseases)
 				if (ID == "[D.uniqueID]-[D.subID]")
 					infctd_mobs++
 					if (L.stat == DEAD)
@@ -240,7 +240,7 @@
 					logs["[ID]"]["[L]"] = D.log
 
 		for (var/obj/item/I in GLOB.infected_items)
-			for(var/datum/disease/advanced/D as anything in I.viruses)
+			for(var/datum/disease/acute/D as anything in I.viruses)
 				if (ID == "[D.uniqueID]-[D.subID]")
 					infctd_items++
 					if(!length(logs["[ID]"]))
@@ -256,7 +256,7 @@
 					logs["[ID]"] += "[dish]"
 					logs["[ID]"]["[dish]"] = dish.contained_virus.log
 
-		var/datum/disease/advanced/D = GLOB.inspectable_diseases[ID]
+		var/datum/disease/acute/D = GLOB.inspectable_diseases[ID]
 		dat += {"<tr>
 			<td><a href='?_src_=holder;[HrefToken(forceGlobal = TRUE)];diseasepanel_examine=["[D.uniqueID]"]-["[D.subID]"]'>[D.form] #["[D.uniqueID]"]-["[D.subID]"]</a></td>
 			<td>[D.origin]</td>