Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/__DEFINES/_tick.dm

@@ -1,5 +1,5 @@
 #define TICK_LIMIT_RUNNING 80
-#define TICK_LIMIT_TO_RUN 78
+#define TICK_LIMIT_TO_RUN 70
 #define TICK_LIMIT_MC 70
 #define TICK_LIMIT_MC_INIT_DEFAULT 98
 

code/__DEFINES/diseases.dm

@@ -0,0 +1,26 @@
+//Visibility Flags
+#define HIDDEN_SCANNER	1
+#define HIDDEN_PANDEMIC	2
+
+//Disease Flags
+#define CURABLE		1
+#define CAN_CARRY	2
+#define CAN_RESIST	4
+
+//Spread Flags
+#define VIRUS_SPREAD_SPECIAL 1
+#define VIRUS_SPREAD_NON_CONTAGIOUS 2
+#define VIRUS_SPREAD_BLOOD 4
+#define VIRUS_SPREAD_CONTACT_FLUIDS 8
+#define VIRUS_SPREAD_CONTACT_SKIN 16
+#define VIRUS_SPREAD_AIRBORNE 32
+
+
+//Severity Defines
+#define VIRUS_SEVERITY_POSITIVE		"Positive"  //Diseases that buff, heal, or at least do nothing at all
+#define VIRUS_SEVERITY_NONTHREAT	"Harmless"  //Diseases that may have annoying effects, but nothing disruptive (sneezing)
+#define VIRUS_SEVERITY_MINOR		"Minor"	    //Diseases that can annoy in concrete ways (dizziness)
+#define VIRUS_SEVERITY_MEDIUM		"Medium"    //Diseases that can do minor harm, or severe annoyance (vomit)
+#define VIRUS_SEVERITY_HARMFUL		"Harmful"   //Diseases that can do significant harm, or severe disruption (brainrot)
+#define VIRUS_SEVERITY_DANGEROUS 	"Dangerous" //Diseases that can kill or maim if left untreated (flesh eating, blindness)
+#define VIRUS_SEVERITY_BIOHAZARD	"BIOHAZARD" //Diseases that can quickly kill an unprepared victim (fungal tb, gbs)

code/__DEFINES/is_helpers.dm

@@ -8,6 +8,8 @@
 
 #define ismovableatom(A) (istype(A, /atom/movable))
 
+#define isatom(A) (istype(A, /atom))
+
 //Turfs
 //#define isturf(A) (istype(A, /turf)) This is actually a byond built-in. Added here for completeness sake.
 

code/__DEFINES/time.dm

@@ -20,4 +20,8 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using
 
 #define HOURS MINUTES*60
 
-#define TICKS *world.tick_lag
+#define TICKS *world.tick_lag
+
+#define DS2TICKS(DS) (DS/world.tick_lag)
+
+#define TICKS2DS(T) (T TICKS)

code/__HELPERS/game.dm

@@ -570,9 +570,12 @@
 	return hex2num(copytext(hexa, 6, 8))
 
 /proc/lavaland_equipment_pressure_check(turf/T)
+	. = FALSE
 	if(!istype(T))
 		return
 	var/datum/gas_mixture/environment = T.return_air()
+	if(!istype(environment))
+		return
 	var/pressure = environment.return_pressure()
 	if(pressure <= LAVALAND_EQUIPMENT_EFFECT_PRESSURE)
-		return TRUE
+		. = TRUE

code/__HELPERS/mobs.dm

@@ -321,7 +321,7 @@ Proc for attack log creation, because really why not
 	var/starttime = world.time
 	. = 1
 	while (world.time < endtime)
-		stoplag()
+		stoplag(1)
 		if (progress)
 			progbar.update(world.time - starttime)
 		if(QDELETED(user) || QDELETED(target))
@@ -382,7 +382,7 @@ Proc for attack log creation, because really why not
 	var/starttime = world.time
 	. = 1
 	while (world.time < endtime)
-		stoplag()
+		stoplag(1)
 		if (progress)
 			progbar.update(world.time - starttime)
 
@@ -437,7 +437,7 @@ Proc for attack log creation, because really why not
 	. = 1
 	mainloop:
 		while(world.time < endtime)
-			sleep(1)
+			stoplag(1)
 			if(progress)
 				progbar.update(world.time - starttime)
 			if(QDELETED(user) || !targets)

code/__HELPERS/unsorted.dm

@@ -504,10 +504,10 @@ Turf and target are separate in case you want to teleport some distance from a t
 
 /atom/proc/GetAllContents(list/output=list())
 	. = output
-	output += src 
-	for(var/i in 1 to contents.len) 
-		var/atom/thing = contents[i] 
-		thing.GetAllContents(output) 
+	output += src
+	for(var/i in 1 to contents.len)
+		var/atom/thing = contents[i]
+		thing.GetAllContents(output)
 
 //Step-towards method of determining whether one atom can see another. Similar to viewers()
 /proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate.
@@ -1225,16 +1225,19 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
 
 //Increases delay as the server gets more overloaded,
 //as sleeps aren't cheap and sleeping only to wake up and sleep again is wasteful
-#define DELTA_CALC max(((max(TICK_USAGE, world.cpu) / 100) * max(Master.sleep_delta,1)), 1)
+#define DELTA_CALC max(((max(TICK_USAGE, world.cpu) / 100) * max(Master.sleep_delta-1,1)), 1)
 
-/proc/stoplag()
+//returns the number of ticks slept
+/proc/stoplag(initial_delay)
 	if (!Master || !(Master.current_runlevel & RUNLEVELS_DEFAULT))
 		sleep(world.tick_lag)
 		return 1
+	if (!initial_delay)
+		initial_delay = world.tick_lag
 	. = 0
-	var/i = 1
+	var/i = DS2TICKS(initial_delay)
 	do
-		. += round(i*DELTA_CALC)
+		. += Ceiling(i*DELTA_CALC)
 		sleep(i*world.tick_lag*DELTA_CALC)
 		i *= 2
 	while (TICK_USAGE > min(TICK_LIMIT_TO_RUN, Master.current_ticklimit))

code/controllers/master.dm

@@ -33,7 +33,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/init_time
 	var/tickdrift = 0
 
-	var/sleep_delta
+	var/sleep_delta = 1
 
 	var/make_runtime = 0
 
@@ -53,7 +53,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
 	var/static/restart_count = 0
-	
+
 	//current tick limit, assigned before running a subsystem.
 	//used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits
 	var/static/current_ticklimit = TICK_LIMIT_RUNNING
@@ -276,35 +276,45 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 
 	iteration = 1
 	var/error_level = 0
-	var/sleep_delta = 0
+	var/sleep_delta = 1
 	var/list/subsystems_to_check
 	//the actual loop.
+
 	while (1)
 		tickdrift = max(0, MC_AVERAGE_FAST(tickdrift, (((REALTIMEOFDAY - init_timeofday) - (world.time - init_time)) / world.tick_lag)))
+		var/starting_tick_usage = TICK_USAGE
 		if (processing <= 0)
 			current_ticklimit = TICK_LIMIT_RUNNING
 			sleep(10)
 			continue
 
-		//if there are mutiple sleeping procs running before us hogging the cpu, we have to run later
-		//	because sleeps are processed in the order received, so longer sleeps are more likely to run first
-		if (TICK_USAGE > TICK_LIMIT_MC)
-			sleep_delta += 2
+		//Anti-tick-contention heuristics:
+		//if there are mutiple sleeping procs running before us hogging the cpu, we have to run later.
+		//	(because sleeps are processed in the order received, longer sleeps are more likely to run first)
+		if (starting_tick_usage > TICK_LIMIT_MC) //if there isn't enough time to bother doing anything this tick, sleep a bit.
+			sleep_delta *= 2
 			current_ticklimit = TICK_LIMIT_RUNNING * 0.5
-			sleep(world.tick_lag * (processing + sleep_delta))
+			sleep(world.tick_lag * (processing * sleep_delta))
 			continue
 
-		sleep_delta = MC_AVERAGE_FAST(sleep_delta, 0)
-		if (last_run + (world.tick_lag * processing) > world.time)
-			sleep_delta += 1
-		if (TICK_USAGE > (TICK_LIMIT_MC*0.5))
+		//Byond resumed us late. assume it might have to do the same next tick
+		if (last_run + Ceiling(world.tick_lag * (processing * sleep_delta), world.tick_lag) < world.time)
 			sleep_delta += 1
 
+		sleep_delta = MC_AVERAGE_FAST(sleep_delta, 1) //decay sleep_delta
+
+		if (starting_tick_usage > (TICK_LIMIT_MC*0.75)) //we ran 3/4 of the way into the tick
+			sleep_delta += 1
+
+		//debug
 		if (make_runtime)
 			var/datum/controller/subsystem/SS
 			SS.can_fire = 0
+
 		if (!Failsafe || (Failsafe.processing_interval > 0 && (Failsafe.lasttick+(Failsafe.processing_interval*5)) < world.time))
 			new/datum/controller/failsafe() // (re)Start the failsafe.
+
+		//now do the actual stuff
 		if (!queue_head || !(iteration % 3))
 			var/checking_runlevel = current_runlevel
 			if(cached_runlevel != checking_runlevel)
@@ -321,6 +331,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			subsystems_to_check = current_runlevel_subsystems
 		else
 			subsystems_to_check = tickersubsystems
+
 		if (CheckQueue(subsystems_to_check) <= 0)
 			if (!SoftReset(tickersubsystems, runlevel_sorted_subsystems))
 				log_world("MC: SoftReset() failed, crashing")
@@ -351,8 +362,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 		iteration++
 		last_run = world.time
 		src.sleep_delta = MC_AVERAGE_FAST(src.sleep_delta, sleep_delta)
-		current_ticklimit = TICK_LIMIT_RUNNING - (TICK_LIMIT_RUNNING * 0.25) //reserve the tail 1/4 of the next tick for the mc.
-		sleep(world.tick_lag * (processing + sleep_delta))
+		current_ticklimit = TICK_LIMIT_RUNNING
+		if (processing * sleep_delta <= world.tick_lag)
+			current_ticklimit -= (TICK_LIMIT_RUNNING * 0.25) //reserve the tail 1/4 of the next tick for the mc if we plan on running next tick
+		sleep(world.tick_lag * (processing * sleep_delta))
 
 
 

code/controllers/subsystem/ticker.dm

@@ -118,8 +118,10 @@ SUBSYSTEM_DEF(ticker)
 				
 	if(isemptylist(music))
 		music = world.file2list(ROUND_START_MUSIC_LIST, "\n")
-
-	login_music = pick(music)
+		login_music = pick(music)
+	else
+		login_music = "config/title_music/sounds/[pick(music)]"
+	
 
 	if(!GLOB.syndicate_code_phrase)
 		GLOB.syndicate_code_phrase	= generate_code_phrase()

code/datums/browser.dm

@@ -177,7 +177,7 @@
 
 /datum/browser/alert/proc/wait()
 	while (opentime && selectedbutton <= 0 && (!timeout || opentime+timeout > world.time))
-		stoplag()
+		stoplag(1)
 
 /datum/browser/alert/Topic(href,href_list)
 	if (href_list["close"] || !user || !user.client)

code/datums/components/infective.dm

@@ -0,0 +1,13 @@
+/datum/component/infective
+	var/list/datum/disease/diseases //make sure these are the static, non-processing versions!
+
+/datum/component/infective/Initialize(list/datum/disease/_diseases)
+	RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/Infect)
+	diseases = _diseases
+
+/datum/component/infective/proc/Infect(atom/movable/AM)
+	var/mob/living/carbon/victim = AM
+	if(istype(victim))
+		for(var/datum/disease/D in diseases)
+			victim.ContactContractDisease(D, "feet")
+		return TRUE

code/datums/components/material_container.dm

@@ -20,6 +20,7 @@
 	var/last_inserted_id
 	var/last_amount_inserted
 	var/last_insert_success
+	var/precise_insertion = FALSE
 	var/datum/callback/precondition
 	//MAX_STACK_SIZE = 50
 	//MINERAL_MATERIAL_AMOUNT = 2000
@@ -70,10 +71,21 @@
 	if(!has_space(material_amount))
 		to_chat(user, "<span class='warning'>[parent] is full. Please remove metal or glass from [parent] in order to insert more.</span>")
 		return
+	INVOKE_ASYNC(src, .proc/user_insert, I, user)
+
+/datum/component/material_container/proc/user_insert(obj/item/I, mob/living/user)
+	var/requested_amount
+	if(istype(I, /obj/item/stack) && precise_insertion)
+		var/atom/current_parent = parent
+		requested_amount = input(user, "How much do you want to insert?", "Inserting sheets") as num|null
+		if(isnull(requested_amount) || (requested_amount <= 0))
+			return
+		if(QDELETED(I) || QDELETED(user) || QDELETED(src) || parent != current_parent || !user.canUseTopic(current_parent) || !user.is_holding(I) || !user.Adjacent(current_parent))
+			return
 	if(!user.temporarilyRemoveItemFromInventory(I))
 		to_chat(user, "<span class='warning'>[I] is stuck to you and cannot be placed into [parent].</span>")
 		return
-	var/inserted = insert_item(I)
+	var/inserted = insert_item(I, stack_amt = requested_amount)
 	if(inserted)
 		last_insert_success = TRUE
 		if(istype(I, /obj/item/stack))
@@ -84,7 +96,7 @@
 			to_chat(user, "<span class='notice'>You insert a material total of [inserted] into [parent].</span>")
 			qdel(I)
 	else
-		user.put_in_active_hand(I)	
+		user.put_in_active_hand(I)
 
 //For inserting an amount of material
 /datum/component/material_container/proc/insert_amount(amt, id = null)
@@ -101,21 +113,25 @@
 				M.amount += amt
 				total_amount += amt
 		return (total_amount - total_amount_saved)
-	return 0
+	return FALSE
 
 /datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt = 0)
+	if(isnull(amt))
+		amt = S.amount
+
 	if(amt <= 0)
-		return 0
+		return FALSE
+
 	if(amt > S.amount)
 		amt = S.amount
 
 	var/material_amt = get_item_material_amount(S)
 	if(!material_amt)
-		return 0
+		return FALSE
 
 	amt = min(amt, round(((max_amount - total_amount) / material_amt)))
 	if(!amt)
-		return 0
+		return FALSE
 
 	last_inserted_id = insert_materials(S,amt)
 	last_inserted_type = S.type
@@ -123,16 +139,15 @@
 	last_amount_inserted = amt
 	return amt
 
-/datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1)
+/datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1, stack_amt)
 	if(!I)
-		return 0
+		return FALSE
 	if(istype(I, /obj/item/stack))
-		var/obj/item/stack/S = I
-		return insert_stack(I, S.amount)
+		return insert_stack(I, stack_amt)
 
 	var/material_amount = get_item_material_amount(I)
 	if(!material_amount || !has_space(material_amount))
-		return 0
+		return FALSE
 
 	last_inserted_id = insert_materials(I, multiplier)
 	last_inserted_type = I.type
@@ -155,13 +170,13 @@
 //mats is a list of types of material to use and the corresponding amounts, example: list(MAT_METAL=100, MAT_GLASS=200)
 /datum/component/material_container/proc/use_amount(list/mats, multiplier=1)
 	if(!mats || !mats.len)
-		return 0
+		return FALSE
 
 	var/datum/material/M
 	for(var/MAT in materials)
 		M = materials[MAT]
 		if(M.amount < (mats[MAT] * multiplier))
-			return 0
+			return FALSE
 
 	var/total_amount_save = total_amount
 	for(var/MAT in materials)
@@ -179,7 +194,7 @@
 			M.amount -= amt
 			total_amount -= amt
 			return amt
-	return 0
+	return FALSE
 
 /datum/component/material_container/proc/can_use_amount(amt, id, list/mats)
 	if(amt && id)
@@ -198,7 +213,7 @@
 //For spawning mineral sheets; internal use only
 /datum/component/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null)
 	if(!M.sheet_type)
-		return 0
+		return FALSE
 	if(sheet_amt > 0)
 		if(M.amount < (sheet_amt * MINERAL_MATERIAL_AMOUNT))
 			sheet_amt = round(M.amount / MINERAL_MATERIAL_AMOUNT)
@@ -215,12 +230,12 @@
 			count += sheet_amt
 			use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
 		return count
-	return 0
+	return FALSE
 
 /datum/component/material_container/proc/retrieve_sheets(sheet_amt, id, target = null)
 	if(materials[id])
 		return retrieve(sheet_amt, materials[id], target)
-	return 0
+	return FALSE
 
 /datum/component/material_container/proc/retrieve_amount(amt, id, target)
 	return retrieve_sheets(amount2sheet(amt), id, target)
@@ -238,24 +253,24 @@
 
 /datum/component/material_container/proc/has_materials(list/mats, multiplier=1)
 	if(!mats || !mats.len)
-		return 0
+		return FALSE
 
 	var/datum/material/M
 	for(var/MAT in mats)
 		M = materials[MAT]
 		if(M.amount < (mats[MAT] * multiplier))
-			return 0
-	return 1
+			return FALSE
+	return TRUE
 
 /datum/component/material_container/proc/amount2sheet(amt)
 	if(amt >= MINERAL_MATERIAL_AMOUNT)
 		return round(amt / MINERAL_MATERIAL_AMOUNT)
-	return 0
+	return FALSE
 
 /datum/component/material_container/proc/sheet2amount(sheet_amt)
 	if(sheet_amt > 0)
 		return sheet_amt * MINERAL_MATERIAL_AMOUNT
-	return 0
+	return FALSE
 
 /datum/component/material_container/proc/amount(id)
 	var/datum/material/M = materials[id]
@@ -265,7 +280,7 @@
 //if this container does not support glass, any glass in 'I' will not be taken into account
 /datum/component/material_container/proc/get_item_material_amount(obj/item/I)
 	if(!istype(I))
-		return 0
+		return FALSE
 	var/material_amount = 0
 	for(var/MAT in materials)
 		material_amount += I.materials[MAT]

code/datums/diseases/_MobProcs.dm

@@ -23,7 +23,7 @@
 	return 1
 
 
-/mob/proc/ContractDisease(datum/disease/D)
+/mob/proc/ContactContractDisease(datum/disease/D)
 	if(!CanContractDisease(D))
 		return 0
 	AddDisease(D)
@@ -56,42 +56,31 @@
 		DD.affected_mob.med_hud_set_status()
 
 
-/mob/living/carbon/ContractDisease(datum/disease/D)
+/mob/living/carbon/ContactContractDisease(datum/disease/D, target_zone)
 	if(!CanContractDisease(D))
 		return 0
 
 	var/obj/item/clothing/Cl = null
-	var/passed = 1
+	var/passed = TRUE
 
-	var/head_ch = 100
+	var/head_ch = 80
 	var/body_ch = 100
-	var/hands_ch = 25
-	var/feet_ch = 25
-
-	if(D.spread_flags & CONTACT_HANDS)
-		head_ch = 0
-		body_ch = 0
-		hands_ch = 100
-		feet_ch = 0
-	if(D.spread_flags & CONTACT_FEET)
-		head_ch = 0
-		body_ch = 0
-		hands_ch = 0
-		feet_ch = 100
+	var/hands_ch = 35
+	var/feet_ch = 15
 
 	if(prob(15/D.permeability_mod))
 		return
 
 	if(satiety>0 && prob(satiety/10)) // positive satiety makes it harder to contract the disease.
 		return
-
-	var/target_zone = pick(head_ch;1,body_ch;2,hands_ch;3,feet_ch;4)
+	if(!target_zone)
+		target_zone = pick(head_ch;"head",body_ch;"body",hands_ch;"hands",feet_ch;"feet")
 
 	if(ishuman(src))
 		var/mob/living/carbon/human/H = src
 
 		switch(target_zone)
-			if(1)
+			if("head")
 				if(isobj(H.head) && !istype(H.head, /obj/item/paper))
 					Cl = H.head
 					passed = prob((Cl.permeability_coefficient*100) - 1)
@@ -101,14 +90,14 @@
 				if(passed && isobj(H.wear_neck))
 					Cl = H.wear_neck
 					passed = prob((Cl.permeability_coefficient*100) - 1)
-			if(2)
+			if("body")
 				if(isobj(H.wear_suit))
 					Cl = H.wear_suit
 					passed = prob((Cl.permeability_coefficient*100) - 1)
 				if(passed && isobj(slot_w_uniform))
 					Cl = slot_w_uniform
 					passed = prob((Cl.permeability_coefficient*100) - 1)
-			if(3)
+			if("hands")
 				if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS)
 					Cl = H.wear_suit
 					passed = prob((Cl.permeability_coefficient*100) - 1)
@@ -116,7 +105,7 @@
 				if(passed && isobj(H.gloves))
 					Cl = H.gloves
 					passed = prob((Cl.permeability_coefficient*100) - 1)
-			if(4)
+			if("feet")
 				if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&FEET)
 					Cl = H.wear_suit
 					passed = prob((Cl.permeability_coefficient*100) - 1)
@@ -128,19 +117,30 @@
 	else if(ismonkey(src))
 		var/mob/living/carbon/monkey/M = src
 		switch(target_zone)
-			if(1)
+			if("head")
 				if(M.wear_mask && isobj(M.wear_mask))
 					Cl = M.wear_mask
 					passed = prob((Cl.permeability_coefficient*100) - 1)
 
-	if(!passed && (D.spread_flags & AIRBORNE) && !internal)
-		passed = (prob((50*D.permeability_mod) - 1))
-
 	if(passed)
 		AddDisease(D)
 
+/mob/proc/AirborneContractDisease(datum/disease/D)
+	if((D.spread_flags & VIRUS_SPREAD_AIRBORNE) && prob((50*D.permeability_mod) - 1))
+		ForceContractDisease(D)
 
-//Same as ContractDisease, except never overidden clothes checks
+/mob/living/carbon/AirborneContractDisease(datum/disease/D)
+	if(internal)
+		return
+	..()
+
+/mob/living/carbon/human/AirborneContractDisease(datum/disease/D)
+	if(dna && (NOBREATH in dna.species.species_traits))
+		return
+	..()
+
+
+//Proc to use when you 100% want to infect someone, as long as they aren't immune
 /mob/proc/ForceContractDisease(datum/disease/D)
 	if(!CanContractDisease(D))
 		return 0

code/datums/diseases/_disease.dm

@@ -1,36 +1,8 @@
-
-//Visibility Flags
-#define HIDDEN_SCANNER	1
-#define HIDDEN_PANDEMIC	2
-
-//Disease Flags
-#define CURABLE		1
-#define CAN_CARRY	2
-#define CAN_RESIST	4
-
-//Spread Flags
-#define SPECIAL 1
-#define NON_CONTAGIOUS 2
-#define BLOOD 4
-#define CONTACT_FEET 8
-#define CONTACT_HANDS 16
-#define CONTACT_GENERAL 32
-#define AIRBORNE 64
-
-
-//Severity Defines
-#define NONTHREAT	"No threat"
-#define MINOR		"Minor"
-#define MEDIUM		"Medium"
-#define HARMFUL		"Harmful"
-#define DANGEROUS 	"Dangerous!"
-#define BIOHAZARD	"BIOHAZARD THREAT!"
-
 /datum/disease
 	//Flags
 	var/visibility_flags = 0
 	var/disease_flags = CURABLE|CAN_CARRY|CAN_RESIST
-	var/spread_flags = AIRBORNE
+	var/spread_flags = VIRUS_SPREAD_AIRBORNE | VIRUS_SPREAD_CONTACT_FLUIDS | VIRUS_SPREAD_CONTACT_SKIN
 
 	//Fluff
 	var/form = "Virus"
@@ -54,7 +26,7 @@
 	var/carrier = FALSE //If our host is only a carrier
 	var/bypasses_immunity = FALSE //Does it skip species virus immunity check? Some things may diseases and not viruses
 	var/permeability_mod = 1
-	var/severity =	NONTHREAT
+	var/severity = VIRUS_SEVERITY_POSITIVE
 	var/list/required_organs = list()
 	var/needs_all_cures = TRUE
 	var/list/strain_data = list() //dna_spread special bullshit
@@ -95,25 +67,22 @@
 	if(!. || (needs_all_cures && . < cures.len))
 		return 0
 
-
+//Airborne spreading
 /datum/disease/proc/spread(force_spread = 0)
 	if(!affected_mob)
 		return
 
-	if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread)
+	if(!(spread_flags & VIRUS_SPREAD_AIRBORNE) && !force_spread)
 		return
 
 	if(affected_mob.reagents.has_reagent("spaceacillin") || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
 		return
 
-	var/spread_range = 1
+	var/spread_range = 2
 
 	if(force_spread)
 		spread_range = force_spread
 
-	if(spread_flags & AIRBORNE)
-		spread_range++
-
 	var/turf/T = affected_mob.loc
 	if(istype(T))
 		for(var/mob/living/carbon/C in oview(spread_range, affected_mob))
@@ -121,7 +90,7 @@
 			if(V)
 				while(TRUE)
 					if(V == T)
-						C.ContractDisease(src)
+						C.AirborneContractDisease(src)
 						break
 					var/turf/Temp = get_step_towards(V, T)
 					if(!CANATMOSPASS(V, Temp))
@@ -129,10 +98,10 @@
 					V = Temp
 
 
-/datum/disease/proc/cure()
+/datum/disease/proc/cure(add_resistance = TRUE)
 	if(affected_mob)
 		if(disease_flags & CAN_RESIST)
-			if(!(type in affected_mob.resistances))
+			if(add_resistance && !(type in affected_mob.resistances))
 				affected_mob.resistances += type
 		remove_virus()
 	qdel(src)
@@ -152,12 +121,6 @@
 /datum/disease/proc/GetDiseaseID()
 	return type
 
-
-/datum/disease/proc/IsSpreadByTouch()
-	if(spread_flags & CONTACT_FEET || spread_flags & CONTACT_HANDS || spread_flags & CONTACT_GENERAL)
-		return 1
-	return 0
-
 //don't use this proc directly. this should only ever be called by cure()
 /datum/disease/proc/remove_virus()
 	affected_mob.viruses -= src		//remove the datum from the list

code/datums/diseases/advance/advance.dm

@@ -183,19 +183,19 @@
 		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
+		if(!S.neutered)
+			properties["severity"] = max(properties["severity"], S.severity) // severity is based on the highest severity non-neutered symptom
 	return
 
 // Assign the properties that are in the list.
 /datum/disease/advance/proc/AssignProperties()
 
 	if(properties && properties.len)
-		switch(properties["stealth"])
-			if(2 to INFINITY)
-				visibility_flags = HIDDEN_SCANNER
+		if(properties["stealth"] >= 2)
+			visibility_flags = HIDDEN_SCANNER
+
+		SetSpread(Clamp(2 ** (properties["transmittable"] - symptoms.len), VIRUS_SPREAD_BLOOD, VIRUS_SPREAD_AIRBORNE))
 
-		// 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)
@@ -208,35 +208,43 @@
 // Assign the spread type and give it the correct description.
 /datum/disease/advance/proc/SetSpread(spread_id)
 	switch(spread_id)
-		if(NON_CONTAGIOUS)
+		if(VIRUS_SPREAD_NON_CONTAGIOUS)
+			spread_flags = VIRUS_SPREAD_NON_CONTAGIOUS
 			spread_text = "None"
-		if(SPECIAL)
+		if(VIRUS_SPREAD_SPECIAL)
+			spread_flags = VIRUS_SPREAD_SPECIAL
 			spread_text = "None"
-		if(CONTACT_GENERAL, CONTACT_HANDS, CONTACT_FEET)
-			spread_text = "On contact"
-		if(AIRBORNE)
-			spread_text = "Airborne"
-		if(BLOOD)
+		if(VIRUS_SPREAD_BLOOD)
+			spread_flags = VIRUS_SPREAD_BLOOD
 			spread_text = "Blood"
-
-	spread_flags = spread_id
+		if(VIRUS_SPREAD_CONTACT_FLUIDS)
+			spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_FLUIDS
+			spread_text = "Fluids"
+		if(VIRUS_SPREAD_CONTACT_SKIN)
+			spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_FLUIDS | VIRUS_SPREAD_CONTACT_SKIN
+			spread_text = "On contact"
+		if(VIRUS_SPREAD_AIRBORNE)
+			spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_FLUIDS | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_AIRBORNE
+			spread_text = "Airborne"
 
 /datum/disease/advance/proc/SetSeverity(level_sev)
 
 	switch(level_sev)
 
 		if(-INFINITY to 0)
-			severity = NONTHREAT
+			severity = VIRUS_SEVERITY_POSITIVE
 		if(1)
-			severity = MINOR
+			severity = VIRUS_SEVERITY_NONTHREAT
 		if(2)
-			severity = MEDIUM
+			severity = VIRUS_SEVERITY_MINOR
 		if(3)
-			severity = HARMFUL
+			severity = VIRUS_SEVERITY_MEDIUM
 		if(4)
-			severity = DANGEROUS
-		if(5 to INFINITY)
-			severity = BIOHAZARD
+			severity = VIRUS_SEVERITY_HARMFUL
+		if(5)
+			severity = VIRUS_SEVERITY_DANGEROUS
+		if(6 to INFINITY)
+			severity = VIRUS_SEVERITY_BIOHAZARD
 		else
 			severity = "Unknown"
 

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

@@ -94,7 +94,7 @@ Bonus
 	stage_speed = -1
 	transmittable = -2
 	level = 7
-	severity = 3
+	severity = 6
 	base_message_chance = 15
 	symptom_delay_min = 14
 	symptom_delay_max = 30

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

@@ -40,7 +40,7 @@ BONUS
 		return
 	if(A.properties["stealth"] >= 4)
 		suppress_warning = TRUE
-	if(A.spread_flags &= AIRBORNE) //infect bystanders
+	if(A.spread_flags &= VIRUS_SPREAD_AIRBORNE) //infect bystanders
 		infective = TRUE
 	if(A.properties["resistance"] >= 3) //strong enough to drop items
 		power = 1.5

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

@@ -24,7 +24,7 @@ Bonus
 	stage_speed = -1
 	transmittable = -3
 	level = 4
-	severity = 3
+	severity = 4
 	base_message_chance = 100
 	symptom_delay_min = 25
 	symptom_delay_max = 80

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

@@ -23,7 +23,7 @@ Bonus
 	stage_speed = 0
 	transmittable = -3
 	level = 6
-	severity = 3
+	severity = 4
 	var/list/possible_mutations
 	var/archived_dna = null
 	base_message_chance = 50

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

@@ -23,7 +23,7 @@ Bonus
 	stage_speed = -3
 	transmittable = -1
 	level = 5
-	severity = 3
+	severity = 2
 	base_message_chance = 25
 	symptom_delay_min = 25
 	symptom_delay_max = 90

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

@@ -22,7 +22,7 @@ Bonus
 	level = 6
 	symptom_delay_min = 15
 	symptom_delay_max = 80
-	severity = 5
+	severity = 4
 	var/sleep_level = 0
 	var/sleepy_ticks = 0
 	var/stamina = FALSE

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

@@ -23,7 +23,6 @@ Bonus
 	stage_speed = -4
 	transmittable = -3
 	level = 5
-	severity = 0
 	symptom_delay_min = 5
 	symptom_delay_max = 10
 	var/purge_alcohol = FALSE

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

@@ -24,7 +24,7 @@ Bonus
 	stage_speed = -4
 	transmittable = -3
 	level = 5
-	severity = 4
+	severity = 5
 	base_message_chance = 50
 	symptom_delay_min = 25
 	symptom_delay_max = 80

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

@@ -28,7 +28,7 @@ Bonus
 	stage_speed = 0
 	transmittable = 1
 	level = 3
-	severity = 4
+	severity = 3
 	base_message_chance = 100
 	symptom_delay_min = 25
 	symptom_delay_max = 80

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

@@ -24,7 +24,7 @@ Bonus
 	stage_speed = -2
 	transmittable = -2
 	level = 4
-	severity = 1
+	severity = 3
 	base_message_chance = 100
 	symptom_delay_min = 15
 	symptom_delay_max = 45
@@ -75,7 +75,7 @@ Bonus
 	stage_speed = -2
 	transmittable = -2
 	level = 3
-	severity = 1
+	severity = 3
 	base_message_chance = 100
 	symptom_delay_min = 15
 	symptom_delay_max = 45

code/datums/diseases/anxiety.dm

@@ -3,13 +3,13 @@
 	form = "Infection"
 	max_stages = 4
 	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
 	cure_text = "Ethanol"
 	cures = list("ethanol")
 	agent = "Excess Lepidopticides"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated subject will regurgitate butterflies."
-	severity = MEDIUM
+	severity = VIRUS_SEVERITY_MINOR
 
 /datum/disease/anxiety/stage_act()
 	..()

code/datums/diseases/appendicitis.dm

@@ -7,9 +7,9 @@
 	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!"
+	severity = VIRUS_SEVERITY_MEDIUM
 	disease_flags = CAN_CARRY|CAN_RESIST
-	spread_flags = NON_CONTAGIOUS
+	spread_flags = VIRUS_SPREAD_NON_CONTAGIOUS
 	visibility_flags = HIDDEN_PANDEMIC
 	required_organs = list(/obj/item/organ/appendix)
 	bypasses_immunity = TRUE // Immunity is based on not having an appendix; this isn't a virus

code/datums/diseases/beesease.dm

@@ -1,40 +1,40 @@
-/datum/disease/beesease
-	name = "Beesease"
-	form = "Infection"
-	max_stages = 4
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Sugar"
-	cures = list("sugar")
-	agent = "Apidae Infection"
+/datum/disease/beesease
+	name = "Beesease"
+	form = "Infection"
+	max_stages = 4
+	spread_text = "On contact"
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
+	cure_text = "Sugar"
+	cures = list("sugar")
+	agent = "Apidae Infection"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-	desc = "If left untreated subject will regurgitate bees."
-	severity = DANGEROUS
-
-/datum/disease/beesease/stage_act()
-	..()
-	switch(stage)
-		if(2) //also changes say, see say.dm
-			if(prob(2))
-				to_chat(affected_mob, "<span class='notice'>You taste honey in your mouth.</span>")
-		if(3)
-			if(prob(10))
-				to_chat(affected_mob, "<span class='notice'>Your stomach rumbles.</span>")
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>Your stomach stings painfully.</span>")
-				if(prob(20))
-					affected_mob.adjustToxLoss(2)
-					affected_mob.updatehealth()
-		if(4)
-			if(prob(10))
-				affected_mob.visible_message("<span class='danger'>[affected_mob] buzzes.</span>", \
-												"<span class='userdanger'>Your stomach buzzes violently!</span>")
-			if(prob(5))
-				to_chat(affected_mob, "<span class='danger'>You feel something moving in your throat.</span>")
-			if(prob(1))
-				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
-													"<span class='userdanger'>You cough up a swarm of bees!</span>")
-				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
-		//if(5)
-		//Plus if you die, you explode into bees
-	return
+	desc = "If left untreated subject will regurgitate bees."
+	severity = VIRUS_SEVERITY_MEDIUM
+
+/datum/disease/beesease/stage_act()
+	..()
+	switch(stage)
+		if(2) //also changes say, see say.dm
+			if(prob(2))
+				to_chat(affected_mob, "<span class='notice'>You taste honey in your mouth.</span>")
+		if(3)
+			if(prob(10))
+				to_chat(affected_mob, "<span class='notice'>Your stomach rumbles.</span>")
+			if(prob(2))
+				to_chat(affected_mob, "<span class='danger'>Your stomach stings painfully.</span>")
+				if(prob(20))
+					affected_mob.adjustToxLoss(2)
+					affected_mob.updatehealth()
+		if(4)
+			if(prob(10))
+				affected_mob.visible_message("<span class='danger'>[affected_mob] buzzes.</span>", \
+												"<span class='userdanger'>Your stomach buzzes violently!</span>")
+			if(prob(5))
+				to_chat(affected_mob, "<span class='danger'>You feel something moving in your throat.</span>")
+			if(prob(1))
+				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
+													"<span class='userdanger'>You cough up a swarm of bees!</span>")
+				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
+		//if(5)
+		//Plus if you die, you explode into bees
+	return

code/datums/diseases/brainrot.dm

@@ -1,59 +1,59 @@
-/datum/disease/brainrot
-	name = "Brainrot"
-	max_stages = 4
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Mannitol"
-	cures = list("mannitol")
-	agent = "Cryptococcus Cosmosis"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	cure_chance = 15//higher chance to cure, since two reagents are required
-	desc = "This disease destroys the braincells, causing brain fever, brain necrosis and general intoxication."
+/datum/disease/brainrot
+	name = "Brainrot"
+	max_stages = 4
+	spread_text = "On contact"
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
+	cure_text = "Mannitol"
+	cures = list("mannitol")
+	agent = "Cryptococcus Cosmosis"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	cure_chance = 15//higher chance to cure, since two reagents are required
+	desc = "This disease destroys the braincells, causing brain fever, brain necrosis and general intoxication."
 	required_organs = list(/obj/item/organ/brain)
-	severity = DANGEROUS
-
-/datum/disease/brainrot/stage_act() //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist -ACTUALLY Removed rather than commented out, I don't see it returning - RR
-	..()
-
-	switch(stage)
-		if(2)
-			if(prob(2))
-				affected_mob.emote("blink")
-			if(prob(2))
-				affected_mob.emote("yawn")
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>You don't feel like yourself.</span>")
-			if(prob(5))
-				affected_mob.adjustBrainLoss(1)
-				affected_mob.updatehealth()
-		if(3)
-			if(prob(2))
-				affected_mob.emote("stare")
-			if(prob(2))
-				affected_mob.emote("drool")
-			if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't retard you to death now
-				affected_mob.adjustBrainLoss(2)
-				affected_mob.updatehealth()
-				if(prob(2))
-					to_chat(affected_mob, "<span class='danger'>Your try to remember something important...but can't.</span>")
-
-		if(4)
-			if(prob(2))
-				affected_mob.emote("stare")
-			if(prob(2))
-				affected_mob.emote("drool")
-			if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't retard you to death now
-				affected_mob.adjustBrainLoss(3)
-				affected_mob.updatehealth()
-				if(prob(2))
-					to_chat(affected_mob, "<span class='danger'>Strange buzzing fills your head, removing all thoughts.</span>")
-			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.Unconscious(rand(100,200))
-				if(prob(1))
-					affected_mob.emote("snore")
-			if(prob(15))
-				affected_mob.stuttering += 3
-
-	return
+	severity = VIRUS_SEVERITY_HARMFUL
+
+/datum/disease/brainrot/stage_act() //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist -ACTUALLY Removed rather than commented out, I don't see it returning - RR
+	..()
+
+	switch(stage)
+		if(2)
+			if(prob(2))
+				affected_mob.emote("blink")
+			if(prob(2))
+				affected_mob.emote("yawn")
+			if(prob(2))
+				to_chat(affected_mob, "<span class='danger'>You don't feel like yourself.</span>")
+			if(prob(5))
+				affected_mob.adjustBrainLoss(1)
+				affected_mob.updatehealth()
+		if(3)
+			if(prob(2))
+				affected_mob.emote("stare")
+			if(prob(2))
+				affected_mob.emote("drool")
+			if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't retard you to death now
+				affected_mob.adjustBrainLoss(2)
+				affected_mob.updatehealth()
+				if(prob(2))
+					to_chat(affected_mob, "<span class='danger'>Your try to remember something important...but can't.</span>")
+
+		if(4)
+			if(prob(2))
+				affected_mob.emote("stare")
+			if(prob(2))
+				affected_mob.emote("drool")
+			if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't retard you to death now
+				affected_mob.adjustBrainLoss(3)
+				affected_mob.updatehealth()
+				if(prob(2))
+					to_chat(affected_mob, "<span class='danger'>Strange buzzing fills your head, removing all thoughts.</span>")
+			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.Unconscious(rand(100,200))
+				if(prob(1))
+					affected_mob.emote("snore")
+			if(prob(15))
+				affected_mob.stuttering += 3
+
+	return

code/datums/diseases/cold.dm

@@ -1,66 +1,65 @@
-/datum/disease/cold
-	name = "The Cold"
-	max_stages = 3
-	spread_flags = AIRBORNE
-	cure_text = "Rest & Spaceacillin"
-	cures = list("spaceacillin")
-	agent = "XY-rhinovirus"
-	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-	permeability_mod = 0.5
-	desc = "If left untreated the subject will contract the flu."
-	severity = MINOR
-
-/datum/disease/cold/stage_act()
-	..()
-	switch(stage)
-		if(2)
-/*
-			if(affected_mob.sleeping && prob(40))  //removed until sleeping is fixed
-				to_chat(affected_mob, "\blue You feel better.")
-				cure()
-				return
-*/
-			if(affected_mob.lying && prob(40))  //changed FROM prob(10) until sleeping is fixed
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				cure()
-				return
-			if(prob(1) && prob(5))
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				cure()
-				return
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
-		if(3)
-/*
-			if(affected_mob.sleeping && prob(25))  //removed until sleeping is fixed
-				to_chat(affected_mob, "\blue You feel better.")
-				cure()
-				return
-*/
-			if(affected_mob.lying && prob(25))  //changed FROM prob(5) until sleeping is fixed
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				cure()
-				return
-			if(prob(1) && prob(1))
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				cure()
-				return
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
-			if(prob(1) && prob(50))
-				if(!affected_mob.resistances.Find(/datum/disease/flu))
-					var/datum/disease/Flu = new /datum/disease/flu(0)
-					affected_mob.ContractDisease(Flu)
-					cure()
+/datum/disease/cold
+	name = "The Cold"
+	max_stages = 3
+	cure_text = "Rest & Spaceacillin"
+	cures = list("spaceacillin")
+	agent = "XY-rhinovirus"
+	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+	permeability_mod = 0.5
+	desc = "If left untreated the subject will contract the flu."
+	severity = VIRUS_SEVERITY_NONTHREAT
+
+/datum/disease/cold/stage_act()
+	..()
+	switch(stage)
+		if(2)
+/*
+			if(affected_mob.sleeping && prob(40))  //removed until sleeping is fixed
+				to_chat(affected_mob, "\blue You feel better.")
+				cure()
+				return
+*/
+			if(affected_mob.lying && prob(40))  //changed FROM prob(10) until sleeping is fixed
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1) && prob(5))
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
+		if(3)
+/*
+			if(affected_mob.sleeping && prob(25))  //removed until sleeping is fixed
+				to_chat(affected_mob, "\blue You feel better.")
+				cure()
+				return
+*/
+			if(affected_mob.lying && prob(25))  //changed FROM prob(5) until sleeping is fixed
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1) && prob(1))
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
+			if(prob(1) && prob(50))
+				if(!affected_mob.resistances.Find(/datum/disease/flu))
+					var/datum/disease/Flu = new /datum/disease/flu(0)
+					affected_mob.ForceContractDisease(Flu)
+					cure()

code/datums/diseases/cold9.dm

@@ -1,39 +1,39 @@
-/datum/disease/cold9
-	name = "The Cold"
-	max_stages = 3
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Common Cold Anti-bodies & Spaceacillin"
-	cures = list("spaceacillin")
-	agent = "ICE9-rhinovirus"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	desc = "If left untreated the subject will slow, as if partly frozen."
-	severity = MEDIUM
-
-/datum/disease/cold9/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			affected_mob.bodytemperature -= 10
-			if(prob(1) && prob(10))
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				cure()
-				return
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
-			if(prob(5))
-				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
-		if(3)
-			affected_mob.bodytemperature -= 20
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
-			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
+/datum/disease/cold9
+	name = "The Cold"
+	max_stages = 3
+	spread_text = "On contact"
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
+	cure_text = "Common Cold Anti-bodies & Spaceacillin"
+	cures = list("spaceacillin")
+	agent = "ICE9-rhinovirus"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	desc = "If left untreated the subject will slow, as if partly frozen."
+	severity = VIRUS_SEVERITY_HARMFUL
+
+/datum/disease/cold9/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			affected_mob.bodytemperature -= 10
+			if(prob(1) && prob(10))
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
+			if(prob(5))
+				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
+		if(3)
+			affected_mob.bodytemperature -= 20
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
+			if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")

code/datums/diseases/dna_spread.dm

@@ -2,7 +2,7 @@
 	name = "Space Retrovirus"
 	max_stages = 4
 	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
 	cure_text = "Mutadone"
 	cures = list("mutadone")
 	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
@@ -11,7 +11,7 @@
 	var/datum/dna/original_dna = null
 	var/transformed = 0
 	desc = "This disease transplants the genetic code of the initial vector into new hosts."
-	severity = MEDIUM
+	severity = VIRUS_SEVERITY_MEDIUM
 
 
 /datum/disease/dnaspread/stage_act()

code/datums/diseases/fake_gbs.dm

@@ -1,32 +1,32 @@
-/datum/disease/fake_gbs
-	name = "GBS"
-	max_stages = 5
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
-	agent = "Gravitokinetic Bipotential SADS-"
+/datum/disease/fake_gbs
+	name = "GBS"
+	max_stages = 5
+	spread_text = "On contact"
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
+	cure_text = "Synaptizine & Sulfur"
+	cures = list("synaptizine","sulfur")
+	agent = "Gravitokinetic Bipotential SADS-"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-	desc = "If left untreated death will occur."
-	severity = BIOHAZARD
-
-/datum/disease/fake_gbs/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(prob(1))
-				affected_mob.emote("sneeze")
-		if(3)
-			if(prob(5))
-				affected_mob.emote("cough")
-			else if(prob(5))
-				affected_mob.emote("gasp")
-			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
-		if(4)
-			if(prob(10))
-				affected_mob.emote("cough")
-
-		if(5)
-			if(prob(10))
-				affected_mob.emote("cough")
+	desc = "If left untreated death will occur."
+	severity = VIRUS_SEVERITY_BIOHAZARD
+
+/datum/disease/fake_gbs/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(1))
+				affected_mob.emote("sneeze")
+		if(3)
+			if(prob(5))
+				affected_mob.emote("cough")
+			else if(prob(5))
+				affected_mob.emote("gasp")
+			if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
+		if(4)
+			if(prob(10))
+				affected_mob.emote("cough")
+
+		if(5)
+			if(prob(10))
+				affected_mob.emote("cough")

code/datums/diseases/flu.dm

@@ -1,54 +1,54 @@
-/datum/disease/flu
-	name = "The Flu"
-	max_stages = 3
-	spread_text = "Airborne"
-	cure_text = "Spaceacillin"
-	cures = list("spaceacillin")
-	cure_chance = 10
-	agent = "H13N1 flu virion"
+/datum/disease/flu
+	name = "The Flu"
+	max_stages = 3
+	spread_text = "Airborne"
+	cure_text = "Spaceacillin"
+	cures = list("spaceacillin")
+	cure_chance = 10
+	agent = "H13N1 flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-	permeability_mod = 0.75
-	desc = "If left untreated the subject will feel quite unwell."
-	severity = MEDIUM
-
-/datum/disease/flu/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(affected_mob.lying && prob(20))
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				stage--
-				return
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
-				if(prob(20))
-					affected_mob.take_bodypart_damage(1)
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
-				if(prob(20))
-					affected_mob.adjustToxLoss(1)
-					affected_mob.updatehealth()
-
-		if(3)
-			if(affected_mob.lying && prob(15))
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				stage--
-				return
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
-				if(prob(20))
-					affected_mob.take_bodypart_damage(1)
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
-				if(prob(20))
-					affected_mob.adjustToxLoss(1)
-					affected_mob.updatehealth()
-	return
+	permeability_mod = 0.75
+	desc = "If left untreated the subject will feel quite unwell."
+	severity = VIRUS_SEVERITY_MINOR
+
+/datum/disease/flu/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(affected_mob.lying && prob(20))
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				stage--
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
+				if(prob(20))
+					affected_mob.take_bodypart_damage(1)
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
+				if(prob(20))
+					affected_mob.adjustToxLoss(1)
+					affected_mob.updatehealth()
+
+		if(3)
+			if(affected_mob.lying && prob(15))
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				stage--
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
+				if(prob(20))
+					affected_mob.take_bodypart_damage(1)
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
+				if(prob(20))
+					affected_mob.adjustToxLoss(1)
+					affected_mob.updatehealth()
+	return

code/datums/diseases/fluspanish.dm

@@ -1,36 +1,36 @@
-/datum/disease/fluspanish
-	name = "Spanish inquisition Flu"
-	max_stages = 3
-	spread_text = "Airborne"
-	cure_text = "Spaceacillin & Anti-bodies to the common flu"
-	cures = list("spaceacillin")
-	cure_chance = 10
-	agent = "1nqu1s1t10n flu virion"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	permeability_mod = 0.75
-	desc = "If left untreated the subject will burn to death for being a heretic."
-	severity = DANGEROUS
-
-/datum/disease/fluspanish/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			affected_mob.bodytemperature += 10
-			if(prob(5))
-				affected_mob.emote("sneeze")
-			if(prob(5))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>You're burning in your own skin!</span>")
-				affected_mob.take_bodypart_damage(0,5)
-
-		if(3)
-			affected_mob.bodytemperature += 20
-			if(prob(5))
-				affected_mob.emote("sneeze")
-			if(prob(5))
-				affected_mob.emote("cough")
-			if(prob(5))
-				to_chat(affected_mob, "<span class='danger'>You're burning in your own skin!</span>")
-				affected_mob.take_bodypart_damage(0,5)
-	return
+/datum/disease/fluspanish
+	name = "Spanish inquisition Flu"
+	max_stages = 3
+	spread_text = "Airborne"
+	cure_text = "Spaceacillin & Anti-bodies to the common flu"
+	cures = list("spaceacillin")
+	cure_chance = 10
+	agent = "1nqu1s1t10n flu virion"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	permeability_mod = 0.75
+	desc = "If left untreated the subject will burn to death for being a heretic."
+	severity = VIRUS_SEVERITY_DANGEROUS
+
+/datum/disease/fluspanish/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			affected_mob.bodytemperature += 10
+			if(prob(5))
+				affected_mob.emote("sneeze")
+			if(prob(5))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>You're burning in your own skin!</span>")
+				affected_mob.take_bodypart_damage(0,5)
+
+		if(3)
+			affected_mob.bodytemperature += 20
+			if(prob(5))
+				affected_mob.emote("sneeze")
+			if(prob(5))
+				affected_mob.emote("cough")
+			if(prob(5))
+				to_chat(affected_mob, "<span class='danger'>You're burning in your own skin!</span>")
+				affected_mob.take_bodypart_damage(0,5)
+	return

code/datums/diseases/gbs.dm

@@ -1,41 +1,41 @@
-/datum/disease/gbs
-	name = "GBS"
-	max_stages = 5
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
-	cure_chance = 15//higher chance to cure, since two reagents are required
-	agent = "Gravitokinetic Bipotential SADS+"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
-	permeability_mod = 1
-	severity = BIOHAZARD
-
-/datum/disease/gbs/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(prob(45))
-				affected_mob.adjustToxLoss(5)
-				affected_mob.updatehealth()
-			if(prob(1))
-				affected_mob.emote("sneeze")
-		if(3)
-			if(prob(5))
-				affected_mob.emote("cough")
-			else if(prob(5))
-				affected_mob.emote("gasp")
-			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
-		if(4)
-			if(prob(10))
-				affected_mob.emote("cough")
-			affected_mob.adjustToxLoss(5)
-			affected_mob.updatehealth()
-		if(5)
-			to_chat(affected_mob, "<span class='danger'>Your body feels as if it's trying to rip itself open...</span>")
-			if(prob(50))
-				affected_mob.gib()
-		else
-			return
+/datum/disease/gbs
+	name = "GBS"
+	max_stages = 5
+	spread_text = "On contact"
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
+	cure_text = "Synaptizine & Sulfur"
+	cures = list("synaptizine","sulfur")
+	cure_chance = 15//higher chance to cure, since two reagents are required
+	agent = "Gravitokinetic Bipotential SADS+"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
+	permeability_mod = 1
+	severity = VIRUS_SEVERITY_BIOHAZARD
+
+/datum/disease/gbs/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(45))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+			if(prob(1))
+				affected_mob.emote("sneeze")
+		if(3)
+			if(prob(5))
+				affected_mob.emote("cough")
+			else if(prob(5))
+				affected_mob.emote("gasp")
+			if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
+		if(4)
+			if(prob(10))
+				affected_mob.emote("cough")
+			affected_mob.adjustToxLoss(5)
+			affected_mob.updatehealth()
+		if(5)
+			to_chat(affected_mob, "<span class='danger'>Your body feels as if it's trying to rip itself open...</span>")
+			if(prob(50))
+				affected_mob.gib()
+		else
+			return

code/datums/diseases/magnitis.dm

@@ -1,66 +1,66 @@
-/datum/disease/magnitis
-	name = "Magnitis"
-	max_stages = 4
-	spread_text = "Airborne"
-	cure_text = "Iron"
-	cures = list("iron")
-	agent = "Fukkos Miracos"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
-	permeability_mod = 0.75
-	desc = "This disease disrupts the magnetic field of your body, making it act as if a powerful magnet. Injections of iron help stabilize the field."
-	severity = MEDIUM
-
-/datum/disease/magnitis/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>You feel a slight shock course through your body.</span>")
-			if(prob(2))
-				for(var/obj/M in orange(2,affected_mob))
+/datum/disease/magnitis
+	name = "Magnitis"
+	max_stages = 4
+	spread_text = "Airborne"
+	cure_text = "Iron"
+	cures = list("iron")
+	agent = "Fukkos Miracos"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
+	permeability_mod = 0.75
+	desc = "This disease disrupts the magnetic field of your body, making it act as if a powerful magnet. Injections of iron help stabilize the field."
+	severity = VIRUS_SEVERITY_MEDIUM
+
+/datum/disease/magnitis/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(2))
+				to_chat(affected_mob, "<span class='danger'>You feel a slight shock course through your body.</span>")
+			if(prob(2))
+				for(var/obj/M in orange(2,affected_mob))
 					if(!M.anchored && (M.flags_1 & CONDUCT_1))
-						step_towards(M,affected_mob)
-				for(var/mob/living/silicon/S in orange(2,affected_mob))
-					if(isAI(S))
-						continue
-					step_towards(S,affected_mob)
-		if(3)
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>You feel a strong shock course through your body.</span>")
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>You feel like clowning around.</span>")
-			if(prob(4))
-				for(var/obj/M in orange(4,affected_mob))
+						step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(2,affected_mob))
+					if(isAI(S))
+						continue
+					step_towards(S,affected_mob)
+		if(3)
+			if(prob(2))
+				to_chat(affected_mob, "<span class='danger'>You feel a strong shock course through your body.</span>")
+			if(prob(2))
+				to_chat(affected_mob, "<span class='danger'>You feel like clowning around.</span>")
+			if(prob(4))
+				for(var/obj/M in orange(4,affected_mob))
 					if(!M.anchored && (M.flags_1 & CONDUCT_1))
-						var/i
-						var/iter = rand(1,2)
-						for(i=0,i<iter,i++)
-							step_towards(M,affected_mob)
-				for(var/mob/living/silicon/S in orange(4,affected_mob))
-					if(isAI(S))
-						continue
-					var/i
-					var/iter = rand(1,2)
-					for(i=0,i<iter,i++)
-						step_towards(S,affected_mob)
-		if(4)
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>You feel a powerful shock course through your body.</span>")
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>You query upon the nature of miracles.</span>")
-			if(prob(8))
-				for(var/obj/M in orange(6,affected_mob))
+						var/i
+						var/iter = rand(1,2)
+						for(i=0,i<iter,i++)
+							step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(4,affected_mob))
+					if(isAI(S))
+						continue
+					var/i
+					var/iter = rand(1,2)
+					for(i=0,i<iter,i++)
+						step_towards(S,affected_mob)
+		if(4)
+			if(prob(2))
+				to_chat(affected_mob, "<span class='danger'>You feel a powerful shock course through your body.</span>")
+			if(prob(2))
+				to_chat(affected_mob, "<span class='danger'>You query upon the nature of miracles.</span>")
+			if(prob(8))
+				for(var/obj/M in orange(6,affected_mob))
 					if(!M.anchored && (M.flags_1 & CONDUCT_1))
-						var/i
-						var/iter = rand(1,3)
-						for(i=0,i<iter,i++)
-							step_towards(M,affected_mob)
-				for(var/mob/living/silicon/S in orange(6,affected_mob))
-					if(isAI(S))
-						continue
-					var/i
-					var/iter = rand(1,3)
-					for(i=0,i<iter,i++)
-						step_towards(S,affected_mob)
-	return
+						var/i
+						var/iter = rand(1,3)
+						for(i=0,i<iter,i++)
+							step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(6,affected_mob))
+					if(isAI(S))
+						continue
+					var/i
+					var/iter = rand(1,3)
+					for(i=0,i<iter,i++)
+						step_towards(S,affected_mob)
+	return

code/datums/diseases/parrotpossession.dm

@@ -2,7 +2,7 @@
 	name = "Parrot Possession"
 	max_stages = 1
 	spread_text = "Paranormal"
-	spread_flags = SPECIAL
+	spread_flags = VIRUS_SPREAD_SPECIAL
 	disease_flags = CURABLE
 	cure_text = "Holy Water."
 	cures = list("holywater")
@@ -10,7 +10,7 @@
 	agent = "Avian Vengence"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "Subject is possesed by the vengeful spirit of a parrot. Call the priest."
-	severity = MEDIUM
+	severity = VIRUS_SEVERITY_MEDIUM
 	var/mob/living/simple_animal/parrot/Poly/ghost/parrot
 
 /datum/disease/parrot_possession/stage_act()

code/datums/diseases/pierrot_throat.dm

@@ -1,24 +1,28 @@
-/datum/disease/pierrot_throat
-	name = "Pierrot's Throat"
-	max_stages = 4
-	spread_text = "Airborne"
-	cure_text = "Banana products, especially banana bread."
-	cures = list("banana")
-	cure_chance = 75
-	agent = "H0NI<42 Virus"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	permeability_mod = 0.75
-	desc = "If left untreated the subject will probably drive others to insanity."
-	severity = MEDIUM
-
-/datum/disease/pierrot_throat/stage_act()
-	..()
-	switch(stage)
-		if(1)
-			if(prob(10)) to_chat(affected_mob, "<span class='danger'>You feel a little silly.</span>")
-		if(2)
-			if(prob(10)) to_chat(affected_mob, "<span class='danger'>You start seeing rainbows.</span>")
-		if(3)
-			if(prob(10)) to_chat(affected_mob, "<span class='danger'>Your thoughts are interrupted by a loud <b>HONK!</b></span>")
-		if(4)
-			if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
+/datum/disease/pierrot_throat
+	name = "Pierrot's Throat"
+	max_stages = 4
+	spread_text = "Airborne"
+	cure_text = "Banana products, especially banana bread."
+	cures = list("banana")
+	cure_chance = 75
+	agent = "H0NI<42 Virus"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	permeability_mod = 0.75
+	desc = "If left untreated the subject will probably drive others to insanity."
+	severity = VIRUS_SEVERITY_MEDIUM
+
+/datum/disease/pierrot_throat/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>You feel a little silly.</span>")
+		if(2)
+			if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>You start seeing rainbows.</span>")
+		if(3)
+			if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>Your thoughts are interrupted by a loud <b>HONK!</b></span>")
+		if(4)
+			if(prob(5))
+				affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )

code/datums/diseases/retrovirus.dm

@@ -1,83 +1,83 @@
-/datum/disease/dna_retrovirus
-	name = "Retrovirus"
-	max_stages = 4
-	spread_text = "Contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Rest or an injection of mutadone"
-	cure_chance = 6
-	agent = ""
-	viable_mobtypes = list(/mob/living/carbon/human)
-	desc = "A DNA-altering retrovirus that scrambles the structural and unique enzymes of a host constantly."
-	severity = DANGEROUS
-	permeability_mod = 0.4
-	stage_prob = 2
-	var/SE
-	var/UI
-	var/restcure = 0
-
-
-/datum/disease/dna_retrovirus/New()
-	..()
-	agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
-	if(prob(40))
-		cures = list("mutadone")
-	else
-		restcure = 1
-
-
-/datum/disease/dna_retrovirus/stage_act()
-	..()
-	switch(stage)
-		if(1)
-			if(restcure)
-				if(affected_mob.lying && prob(30))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(8))
-				to_chat(affected_mob, "<span class='danger'>Your head hurts.</span>")
-			if (prob(9))
-				to_chat(affected_mob, "You feel a tingling sensation in your chest.")
-			if (prob(9))
-				to_chat(affected_mob, "<span class='danger'>You feel angry.</span>")
-		if(2)
-			if(restcure)
-				if(affected_mob.lying && prob(20))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(8))
-				to_chat(affected_mob, "<span class='danger'>Your skin feels loose.</span>")
-			if (prob(10))
-				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.Unconscious(40)
-			if (prob(4))
-				to_chat(affected_mob, "<span class='danger'>Your stomach churns.</span>")
-		if(3)
-			if(restcure)
-				if(affected_mob.lying && prob(20))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(10))
-				to_chat(affected_mob, "<span class='danger'>Your entire body vibrates.</span>")
-
-			if (prob(35))
-				if(prob(50))
-					scramble_dna(affected_mob, 1, 0, rand(15,45))
-				else
-					scramble_dna(affected_mob, 0, 1, rand(15,45))
-
-		if(4)
-			if(restcure)
-				if(affected_mob.lying && prob(5))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(60))
-				if(prob(50))
-					scramble_dna(affected_mob, 1, 0, rand(50,75))
-				else
-					scramble_dna(affected_mob, 0, 1, rand(50,75))
+/datum/disease/dna_retrovirus
+	name = "Retrovirus"
+	max_stages = 4
+	spread_text = "Contact"
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
+	cure_text = "Rest or an injection of mutadone"
+	cure_chance = 6
+	agent = ""
+	viable_mobtypes = list(/mob/living/carbon/human)
+	desc = "A DNA-altering retrovirus that scrambles the structural and unique enzymes of a host constantly."
+	severity = VIRUS_SEVERITY_HARMFUL
+	permeability_mod = 0.4
+	stage_prob = 2
+	var/SE
+	var/UI
+	var/restcure = 0
+
+
+/datum/disease/dna_retrovirus/New()
+	..()
+	agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
+	if(prob(40))
+		cures = list("mutadone")
+	else
+		restcure = 1
+
+
+/datum/disease/dna_retrovirus/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(restcure)
+				if(affected_mob.lying && prob(30))
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+					cure()
+					return
+			if (prob(8))
+				to_chat(affected_mob, "<span class='danger'>Your head hurts.</span>")
+			if (prob(9))
+				to_chat(affected_mob, "You feel a tingling sensation in your chest.")
+			if (prob(9))
+				to_chat(affected_mob, "<span class='danger'>You feel angry.</span>")
+		if(2)
+			if(restcure)
+				if(affected_mob.lying && prob(20))
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+					cure()
+					return
+			if (prob(8))
+				to_chat(affected_mob, "<span class='danger'>Your skin feels loose.</span>")
+			if (prob(10))
+				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.Unconscious(40)
+			if (prob(4))
+				to_chat(affected_mob, "<span class='danger'>Your stomach churns.</span>")
+		if(3)
+			if(restcure)
+				if(affected_mob.lying && prob(20))
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+					cure()
+					return
+			if (prob(10))
+				to_chat(affected_mob, "<span class='danger'>Your entire body vibrates.</span>")
+
+			if (prob(35))
+				if(prob(50))
+					scramble_dna(affected_mob, 1, 0, rand(15,45))
+				else
+					scramble_dna(affected_mob, 0, 1, rand(15,45))
+
+		if(4)
+			if(restcure)
+				if(affected_mob.lying && prob(5))
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+					cure()
+					return
+			if (prob(60))
+				if(prob(50))
+					scramble_dna(affected_mob, 1, 0, rand(50,75))
+				else
+					scramble_dna(affected_mob, 0, 1, rand(50,75))

code/datums/diseases/rhumba_beat.dm

@@ -1,44 +1,44 @@
-/datum/disease/rhumba_beat
-	name = "The Rhumba Beat"
-	max_stages = 5
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Chick Chicky Boom!"
-	cures = list("plasma")
-	agent = "Unknown"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	permeability_mod = 1
-	severity = BIOHAZARD
-
-/datum/disease/rhumba_beat/stage_act()
-	..()
-	if(affected_mob.ckey == "rosham")
+/datum/disease/rhumba_beat
+	name = "The Rhumba Beat"
+	max_stages = 5
+	spread_text = "On contact"
+	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
+	cure_text = "Chick Chicky Boom!"
+	cures = list("plasma")
+	agent = "Unknown"
+	viable_mobtypes = list(/mob/living/carbon/human)
+	permeability_mod = 1
+	severity = VIRUS_SEVERITY_BIOHAZARD
+
+/datum/disease/rhumba_beat/stage_act()
+	..()
+	if(affected_mob.ckey == "rosham")
 		cure()
-		return
-	switch(stage)
-		if(2)
-			if(prob(45))
-				affected_mob.adjustToxLoss(5)
-				affected_mob.updatehealth()
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>You feel strange...</span>")
-		if(3)
-			if(prob(5))
-				to_chat(affected_mob, "<span class='danger'>You feel the urge to dance...</span>")
-			else if(prob(5))
-				affected_mob.emote("gasp")
-			else if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You feel the need to chick chicky boom...</span>")
-		if(4)
-			if(prob(10))
-				affected_mob.emote("gasp")
-				to_chat(affected_mob, "<span class='danger'>You feel a burning beat inside...</span>")
-			if(prob(20))
-				affected_mob.adjustToxLoss(5)
-				affected_mob.updatehealth()
-		if(5)
-			to_chat(affected_mob, "<span class='danger'>Your body is unable to contain the Rhumba Beat...</span>")
-			if(prob(50))
-				affected_mob.gib()
-		else
-			return
+		return
+	switch(stage)
+		if(2)
+			if(prob(45))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>You feel strange...</span>")
+		if(3)
+			if(prob(5))
+				to_chat(affected_mob, "<span class='danger'>You feel the urge to dance...</span>")
+			else if(prob(5))
+				affected_mob.emote("gasp")
+			else if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>You feel the need to chick chicky boom...</span>")
+		if(4)
+			if(prob(10))
+				affected_mob.emote("gasp")
+				to_chat(affected_mob, "<span class='danger'>You feel a burning beat inside...</span>")
+			if(prob(20))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+		if(5)
+			to_chat(affected_mob, "<span class='danger'>Your body is unable to contain the Rhumba Beat...</span>")
+			if(prob(50))
+				affected_mob.gib()
+		else
+			return

code/datums/diseases/transformation.dm

@@ -1,241 +1,242 @@
-/datum/disease/transformation
-	name = "Transformation"
-	max_stages = 5
-	spread_text = "Acute"
-	spread_flags = SPECIAL
-	cure_text = "A coder's love (theoretical)."
-	agent = "Shenanigans"
-	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/alien)
-	severity = HARMFUL
-	stage_prob = 10
-	visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
-	disease_flags = CURABLE
-	var/list/stage1 = list("You feel unremarkable.")
-	var/list/stage2 = list("You feel boring.")
-	var/list/stage3 = list("You feel utterly plain.")
-	var/list/stage4 = list("You feel white bread.")
-	var/list/stage5 = list("Oh the humanity!")
-	var/new_form = /mob/living/carbon/human
-
-/datum/disease/transformation/stage_act()
-	..()
-	switch(stage)
-		if(1)
-			if (prob(stage_prob) && stage1)
-				to_chat(affected_mob, pick(stage1))
-		if(2)
-			if (prob(stage_prob) && stage2)
-				to_chat(affected_mob, pick(stage2))
-		if(3)
-			if (prob(stage_prob*2) && stage3)
-				to_chat(affected_mob, pick(stage3))
-		if(4)
-			if (prob(stage_prob*2) && stage4)
-				to_chat(affected_mob, pick(stage4))
-		if(5)
-			do_disease_transformation(affected_mob)
-
-/datum/disease/transformation/proc/do_disease_transformation(mob/living/affected_mob)
-	if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD)
-		if(stage5)
-			to_chat(affected_mob, pick(stage5))
-		if(jobban_isbanned(affected_mob, new_form))
-			affected_mob.death(1)
-			return
-		if(affected_mob.notransform)
-			return
-		affected_mob.notransform = 1
-		for(var/obj/item/W in affected_mob.get_equipped_items())
-			affected_mob.dropItemToGround(W)
-		for(var/obj/item/I in affected_mob.held_items)
-			affected_mob.dropItemToGround(I)
-		var/mob/living/new_mob = new new_form(affected_mob.loc)
-		if(istype(new_mob))
-			new_mob.a_intent = INTENT_HARM
-			if(affected_mob.mind)
-				affected_mob.mind.transfer_to(new_mob)
-			else
-				new_mob.key = affected_mob.key
-
-		new_mob.name = affected_mob.real_name
-		new_mob.real_name = new_mob.name
-		qdel(affected_mob)
-
-
-
-/datum/disease/transformation/jungle_fever
-	name = "Jungle Fever"
-	cure_text = "Bananas"
-	cures = list("banana")
-	spread_text = "Monkey Bites"
-	spread_flags = SPECIAL
-	viable_mobtypes = list(/mob/living/carbon/monkey, /mob/living/carbon/human)
-	permeability_mod = 1
-	cure_chance = 1
-	disease_flags = CAN_CARRY|CAN_RESIST
-	desc = "Monkeys with this disease will bite humans, causing humans to mutate into a monkey."
-	severity = BIOHAZARD
-	stage_prob = 4
-	visibility_flags = 0
-	agent = "Kongey Vibrion M-909"
-	new_form = /mob/living/carbon/monkey
-
-	stage1	= null
-	stage2	= null
-	stage3	= null
-	stage4	= list("<span class='warning'>Your back hurts.</span>", "<span class='warning'>You breathe through your mouth.</span>",
-					"<span class='warning'>You have a craving for bananas.</span>", "<span class='warning'>Your mind feels clouded.</span>")
-	stage5	= list("<span class='warning'>You feel like monkeying around.</span>")
-
-/datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob)
-	if(!ismonkey(affected_mob))
-		SSticker.mode.add_monkey(affected_mob.mind)
-		affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
-
-/datum/disease/transformation/jungle_fever/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(prob(2))
-				to_chat(affected_mob, "<span class='notice'>Your [pick("back", "arm", "leg", "elbow", "head")] itches.</span>")
-		if(3)
-			if(prob(4))
-				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
-				affected_mob.confused += 10
-		if(4)
-			if(prob(3))
-				affected_mob.say(pick("Eeek, ook ook!", "Eee-eeek!", "Eeee!", "Ungh, ungh."))
-
-/datum/disease/transformation/jungle_fever/cure()
-	SSticker.mode.remove_monkey(affected_mob.mind)
-	..()
-
-
-/datum/disease/transformation/robot
-
-	name = "Robotic Transformation"
-	cure_text = "An injection of copper."
-	cures = list("copper")
-	cure_chance = 5
-	agent = "R2D2 Nanomachines"
-	desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg."
-	severity = DANGEROUS
-	visibility_flags = 0
-	stage1	= null
-	stage2	= list("Your joints feel stiff.", "<span class='danger'>Beep...boop..</span>")
-	stage3	= list("<span class='danger'>Your joints feel very stiff.</span>", "Your skin feels loose.", "<span class='danger'>You can feel something move...inside.</span>")
-	stage4	= list("<span class='danger'>Your skin feels very loose.</span>", "<span class='danger'>You can feel... something...inside you.</span>")
-	stage5	= list("<span class='danger'>Your skin feels as if it's about to burst off!</span>")
-	new_form = /mob/living/silicon/robot
-
-
-/datum/disease/transformation/robot/stage_act()
-	..()
-	switch(stage)
-		if(3)
-			if (prob(8))
-				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.Unconscious(40)
-		if(4)
-			if (prob(20))
-				affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."))
-
-
-/datum/disease/transformation/xeno
-
-	name = "Xenomorph Transformation"
-	cure_text = "Spaceacillin & Glycerol"
-	cures = list("spaceacillin", "glycerol")
-	cure_chance = 5
-	agent = "Rip-LEY Alien Microbes"
-	desc = "This disease changes the victim into a xenomorph."
-	severity = BIOHAZARD
-	visibility_flags = 0
-	stage1	= null
-	stage2	= list("Your throat feels scratchy.", "<span class='danger'>Kill...</span>")
-	stage3	= list("<span class='danger'>Your throat feels very scratchy.</span>", "Your skin feels tight.", "<span class='danger'>You can feel something move...inside.</span>")
-	stage4	= list("<span class='danger'>Your skin feels very tight.</span>", "<span class='danger'>Your blood boils!</span>", "<span class='danger'>You can feel... something...inside you.</span>")
-	stage5	= list("<span class='danger'>Your skin feels as if it's about to burst off!</span>")
-	new_form = /mob/living/carbon/alien/humanoid/hunter
-
-/datum/disease/transformation/xeno/stage_act()
-	..()
-	switch(stage)
-		if(3)
-			if (prob(4))
-				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
-				affected_mob.Unconscious(40)
-		if(4)
-			if (prob(20))
-				affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"))
-
-
-/datum/disease/transformation/slime
-	name = "Advanced Mutation Transformation"
-	cure_text = "frost oil"
-	cures = list("frostoil")
-	cure_chance = 80
-	agent = "Advanced Mutation Toxin"
-	desc = "This highly concentrated extract converts anything into more of itself."
-	severity = BIOHAZARD
-	visibility_flags = 0
-	stage1	= list("You don't feel very well.")
-	stage2	= list("Your skin feels a little slimy.")
-	stage3	= list("<span class='danger'>Your appendages are melting away.</span>", "<span class='danger'>Your limbs begin to lose their shape.</span>")
-	stage4	= list("<span class='danger'>You are turning into a slime.</span>")
-	stage5	= list("<span class='danger'>You have become a slime.</span>")
-	new_form = /mob/living/simple_animal/slime/random
-
-/datum/disease/transformation/slime/stage_act()
-	..()
-	switch(stage)
-		if(1)
-			if(ishuman(affected_mob) && affected_mob.dna && affected_mob.dna.species.id == "slime")
-				stage = 5
-		if(3)
-			if(ishuman(affected_mob))
-				var/mob/living/carbon/human/human = affected_mob
-				if(human.dna.species.id != "slime")
-					human.set_species(/datum/species/jelly/slime)
-
-/datum/disease/transformation/corgi
-	name = "The Barkening"
-	cure_text = "Death"
-	cures = list("adminordrazine")
-	agent = "Fell Doge Majicks"
-	desc = "This disease transforms the victim into a corgi."
-	visibility_flags = 0
-	stage1	= list("BARK.")
-	stage2	= list("You feel the need to wear silly hats.")
-	stage3	= list("<span class='danger'>Must... eat... chocolate....</span>", "<span class='danger'>YAP</span>")
-	stage4	= list("<span class='danger'>Visions of washing machines assail your mind!</span>")
-	stage5	= list("<span class='danger'>AUUUUUU!!!</span>")
-	new_form = /mob/living/simple_animal/pet/dog/corgi
-
-/datum/disease/transformation/corgi/stage_act()
-	..()
-	switch(stage)
-		if(3)
-			if (prob(8))
-				affected_mob.say(pick("YAP", "Woof!"))
-		if(4)
-			if (prob(20))
-				affected_mob.say(pick("Bark!", "AUUUUUU"))
-
-/datum/disease/transformation/morph
-	name = "Gluttony's Blessing"
-	cure_text = "nothing"
-	cures = list("adminordrazine")
-	agent = "Gluttony's Blessing"
-	desc = "A 'gift' from somewhere terrible."
-	stage_prob = 20
-	severity = BIOHAZARD
-	visibility_flags = 0
-	stage1	= list("Your stomach rumbles.")
-	stage2	= list("Your skin feels saggy.")
-	stage3	= list("<span class='danger'>Your appendages are melting away.</span>", "<span class='danger'>Your limbs begin to lose their shape.</span>")
-	stage4	= list("<span class='danger'>You're ravenous.</span>")
-	stage5	= list("<span class='danger'>You have become a morph.</span>")
-	new_form = /mob/living/simple_animal/hostile/morph
+/datum/disease/transformation
+	name = "Transformation"
+	max_stages = 5
+	spread_text = "Acute"
+	spread_flags = VIRUS_SPREAD_SPECIAL
+	cure_text = "A coder's love (theoretical)."
+	agent = "Shenanigans"
+	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/alien)
+	severity = VIRUS_SEVERITY_BIOHAZARD
+	stage_prob = 10
+	visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
+	disease_flags = CURABLE
+	var/list/stage1 = list("You feel unremarkable.")
+	var/list/stage2 = list("You feel boring.")
+	var/list/stage3 = list("You feel utterly plain.")
+	var/list/stage4 = list("You feel white bread.")
+	var/list/stage5 = list("Oh the humanity!")
+	var/new_form = /mob/living/carbon/human
+
+/datum/disease/transformation/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if (prob(stage_prob) && stage1)
+				to_chat(affected_mob, pick(stage1))
+		if(2)
+			if (prob(stage_prob) && stage2)
+				to_chat(affected_mob, pick(stage2))
+		if(3)
+			if (prob(stage_prob*2) && stage3)
+				to_chat(affected_mob, pick(stage3))
+		if(4)
+			if (prob(stage_prob*2) && stage4)
+				to_chat(affected_mob, pick(stage4))
+		if(5)
+			do_disease_transformation(affected_mob)
+
+/datum/disease/transformation/proc/do_disease_transformation(mob/living/affected_mob)
+	if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD)
+		if(stage5)
+			to_chat(affected_mob, pick(stage5))
+		if(jobban_isbanned(affected_mob, new_form))
+			affected_mob.death(1)
+			return
+		if(affected_mob.notransform)
+			return
+		affected_mob.notransform = 1
+		for(var/obj/item/W in affected_mob.get_equipped_items())
+			affected_mob.dropItemToGround(W)
+		for(var/obj/item/I in affected_mob.held_items)
+			affected_mob.dropItemToGround(I)
+		var/mob/living/new_mob = new new_form(affected_mob.loc)
+		if(istype(new_mob))
+			new_mob.a_intent = INTENT_HARM
+			if(affected_mob.mind)
+				affected_mob.mind.transfer_to(new_mob)
+			else
+				new_mob.key = affected_mob.key
+
+		new_mob.name = affected_mob.real_name
+		new_mob.real_name = new_mob.name
+		qdel(affected_mob)
+
+
+
+/datum/disease/transformation/jungle_fever
+	name = "Jungle Fever"
+	cure_text = "Bananas"
+	cures = list("banana")
+	spread_text = "Monkey Bites"
+	spread_flags = VIRUS_SPREAD_SPECIAL
+	viable_mobtypes = list(/mob/living/carbon/monkey, /mob/living/carbon/human)
+	permeability_mod = 1
+	cure_chance = 1
+	disease_flags = CAN_CARRY|CAN_RESIST
+	desc = "Monkeys with this disease will bite humans, causing humans to mutate into a monkey."
+	severity = VIRUS_SEVERITY_BIOHAZARD
+	stage_prob = 4
+	visibility_flags = 0
+	agent = "Kongey Vibrion M-909"
+	new_form = /mob/living/carbon/monkey
+
+	stage1	= null
+	stage2	= null
+	stage3	= null
+	stage4	= list("<span class='warning'>Your back hurts.</span>", "<span class='warning'>You breathe through your mouth.</span>",
+					"<span class='warning'>You have a craving for bananas.</span>", "<span class='warning'>Your mind feels clouded.</span>")
+	stage5	= list("<span class='warning'>You feel like monkeying around.</span>")
+
+/datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob)
+	if(!ismonkey(affected_mob))
+		SSticker.mode.add_monkey(affected_mob.mind)
+		affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
+
+/datum/disease/transformation/jungle_fever/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(2))
+				to_chat(affected_mob, "<span class='notice'>Your [pick("back", "arm", "leg", "elbow", "head")] itches.</span>")
+		if(3)
+			if(prob(4))
+				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
+				affected_mob.confused += 10
+		if(4)
+			if(prob(3))
+				affected_mob.say(pick("Eeek, ook ook!", "Eee-eeek!", "Eeee!", "Ungh, ungh."))
+
+/datum/disease/transformation/jungle_fever/cure()
+	SSticker.mode.remove_monkey(affected_mob.mind)
+	..()
+
+
+/datum/disease/transformation/robot
+
+	name = "Robotic Transformation"
+	cure_text = "An injection of copper."
+	cures = list("copper")
+	cure_chance = 5
+	agent = "R2D2 Nanomachines"
+	desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg."
+	severity = VIRUS_SEVERITY_BIOHAZARD
+	visibility_flags = 0
+	stage1	= null
+	stage2	= list("Your joints feel stiff.", "<span class='danger'>Beep...boop..</span>")
+	stage3	= list("<span class='danger'>Your joints feel very stiff.</span>", "Your skin feels loose.", "<span class='danger'>You can feel something move...inside.</span>")
+	stage4	= list("<span class='danger'>Your skin feels very loose.</span>", "<span class='danger'>You can feel... something...inside you.</span>")
+	stage5	= list("<span class='danger'>Your skin feels as if it's about to burst off!</span>")
+	new_form = /mob/living/silicon/robot
+
+
+/datum/disease/transformation/robot/stage_act()
+	..()
+	switch(stage)
+		if(3)
+			if (prob(8))
+				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.Unconscious(40)
+		if(4)
+			if (prob(20))
+				affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."))
+
+
+/datum/disease/transformation/xeno
+
+	name = "Xenomorph Transformation"
+	cure_text = "Spaceacillin & Glycerol"
+	cures = list("spaceacillin", "glycerol")
+	cure_chance = 5
+	agent = "Rip-LEY Alien Microbes"
+	desc = "This disease changes the victim into a xenomorph."
+	severity = VIRUS_SEVERITY_BIOHAZARD
+	visibility_flags = 0
+	stage1	= null
+	stage2	= list("Your throat feels scratchy.", "<span class='danger'>Kill...</span>")
+	stage3	= list("<span class='danger'>Your throat feels very scratchy.</span>", "Your skin feels tight.", "<span class='danger'>You can feel something move...inside.</span>")
+	stage4	= list("<span class='danger'>Your skin feels very tight.</span>", "<span class='danger'>Your blood boils!</span>", "<span class='danger'>You can feel... something...inside you.</span>")
+	stage5	= list("<span class='danger'>Your skin feels as if it's about to burst off!</span>")
+	new_form = /mob/living/carbon/alien/humanoid/hunter
+
+/datum/disease/transformation/xeno/stage_act()
+	..()
+	switch(stage)
+		if(3)
+			if (prob(4))
+				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
+				affected_mob.Unconscious(40)
+		if(4)
+			if (prob(20))
+				affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"))
+
+
+/datum/disease/transformation/slime
+	name = "Advanced Mutation Transformation"
+	cure_text = "frost oil"
+	cures = list("frostoil")
+	cure_chance = 80
+	agent = "Advanced Mutation Toxin"
+	desc = "This highly concentrated extract converts anything into more of itself."
+	severity = VIRUS_SEVERITY_BIOHAZARD
+	visibility_flags = 0
+	stage1	= list("You don't feel very well.")
+	stage2	= list("Your skin feels a little slimy.")
+	stage3	= list("<span class='danger'>Your appendages are melting away.</span>", "<span class='danger'>Your limbs begin to lose their shape.</span>")
+	stage4	= list("<span class='danger'>You are turning into a slime.</span>")
+	stage5	= list("<span class='danger'>You have become a slime.</span>")
+	new_form = /mob/living/simple_animal/slime/random
+
+/datum/disease/transformation/slime/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(ishuman(affected_mob) && affected_mob.dna && affected_mob.dna.species.id == "slime")
+				stage = 5
+		if(3)
+			if(ishuman(affected_mob))
+				var/mob/living/carbon/human/human = affected_mob
+				if(human.dna.species.id != "slime")
+					human.set_species(/datum/species/jelly/slime)
+
+/datum/disease/transformation/corgi
+	name = "The Barkening"
+	cure_text = "Death"
+	cures = list("adminordrazine")
+	agent = "Fell Doge Majicks"
+	desc = "This disease transforms the victim into a corgi."
+	severity = VIRUS_SEVERITY_BIOHAZARD
+	visibility_flags = 0
+	stage1	= list("BARK.")
+	stage2	= list("You feel the need to wear silly hats.")
+	stage3	= list("<span class='danger'>Must... eat... chocolate....</span>", "<span class='danger'>YAP</span>")
+	stage4	= list("<span class='danger'>Visions of washing machines assail your mind!</span>")
+	stage5	= list("<span class='danger'>AUUUUUU!!!</span>")
+	new_form = /mob/living/simple_animal/pet/dog/corgi
+
+/datum/disease/transformation/corgi/stage_act()
+	..()
+	switch(stage)
+		if(3)
+			if (prob(8))
+				affected_mob.say(pick("YAP", "Woof!"))
+		if(4)
+			if (prob(20))
+				affected_mob.say(pick("Bark!", "AUUUUUU"))
+
+/datum/disease/transformation/morph
+	name = "Gluttony's Blessing"
+	cure_text = "nothing"
+	cures = list("adminordrazine")
+	agent = "Gluttony's Blessing"
+	desc = "A 'gift' from somewhere terrible."
+	stage_prob = 20
+	severity = VIRUS_SEVERITY_BIOHAZARD
+	visibility_flags = 0
+	stage1	= list("Your stomach rumbles.")
+	stage2	= list("Your skin feels saggy.")
+	stage3	= list("<span class='danger'>Your appendages are melting away.</span>", "<span class='danger'>Your limbs begin to lose their shape.</span>")
+	stage4	= list("<span class='danger'>You're ravenous.</span>")
+	stage5	= list("<span class='danger'>You have become a morph.</span>")
+	new_form = /mob/living/simple_animal/hostile/morph

code/datums/diseases/tuberculosis.dm

@@ -10,7 +10,7 @@
 	cure_chance = 5//like hell are you getting out of hell
 	desc = "A rare highly transmittable virulent virus. Few samples exist, rumoured to be carefully grown and cultured by clandestine bio-weapon specialists. Causes fever, blood vomiting, lung damage, weight loss, and fatigue."
 	required_organs = list(/obj/item/organ/lungs)
-	severity = DANGEROUS
+	severity = VIRUS_SEVERITY_BIOHAZARD
 	bypasses_immunity = TRUE // TB primarily impacts the lungs; it's also bacterial or fungal in nature; viral immunity should do nothing.
 
 /datum/disease/tuberculosis/stage_act() //it begins

code/datums/diseases/wizarditis.dm

@@ -10,7 +10,7 @@
 	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
 	permeability_mod = 0.75
 	desc = "Some speculate that this virus is the cause of the Space Wizard Federation's existence. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition."
-	severity = HARMFUL
+	severity = VIRUS_SEVERITY_HARMFUL
 	required_organs = list(/obj/item/bodypart/head)
 
 /*

code/datums/explosion.dm

@@ -61,14 +61,14 @@ GLOBAL_LIST_EMPTY(explosions)
 		flash_range = min(GLOB.MAX_EX_FLASH_RANGE, flash_range)
 		flame_range = min(GLOB.MAX_EX_FLAME_RANGE, flame_range)
 
-	//DO NOT REMOVE THIS SLEEP, IT BREAKS THINGS
+	//DO NOT REMOVE THIS STOPLAG, IT BREAKS THINGS
 	//not sleeping causes us to ex_act() the thing that triggered the explosion
 	//doing that might cause it to trigger another explosion
 	//this is bad
 	//I would make this not ex_act the thing that triggered the explosion,
 	//but everything that explodes gives us their loc or a get_turf()
 	//and somethings expect us to ex_act them so they can qdel()
-	sleep(1) //tldr, let the calling proc call qdel(src) before we explode
+	stoplag() //tldr, let the calling proc call qdel(src) before we explode
 
 	EX_PREPROCESS_EXIT_CHECK
 

code/datums/martial/wrestling.dm

@@ -199,7 +199,7 @@
 	set waitfor = FALSE
 	if (D)
 		animate(D, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
-	sleep (15)
+	sleep(15)
 	if (D)
 		animate(D, transform = null, time = 1, loop = 0)
 
@@ -258,7 +258,7 @@
 				D.pixel_y = 0
 			return 0
 
-		sleep (1)
+		sleep(1)
 
 	if (A && D)
 		A.pixel_x = 0

code/datums/mind.dm

@@ -551,11 +551,11 @@
 			text += "<b>HEAD</b> | not mindshielded | employee | headrev | rev"
 		else if (src in SSticker.mode.head_revolutionaries)
 			var/last_healthy_headrev = TRUE
-			for(var/I in SSticker.mode.head_revolutionaries)
+			for(var/datum/mind/I in SSticker.mode.head_revolutionaries)
 				if(I == src)
 					continue
-				var/mob/M = I
-				if((M.z in GLOB.station_z_levels) && !M.stat)
+				var/mob/M = I.current
+				if(M && (M.z in GLOB.station_z_levels) && !M.stat)
 					last_healthy_headrev = FALSE
 					break
 			text += "head | not mindshielded | <a href='?src=\ref[src];revolution=clear'>employee</a> | <b>[last_healthy_headrev ? "<font color='red'>LAST </font> " : ""]HEADREV</b> | <a href='?src=\ref[src];revolution=rev'>rev</a>"
@@ -1300,7 +1300,7 @@
 					if (istype(M))
 						for(var/datum/disease/transformation/jungle_fever/JF in M.viruses)
 							JF.cure(0)
-							sleep(0) //because deleting of virus is doing throught spawn(0) //What
+							stoplag() //because deleting of virus is doing throught spawn(0) //What
 						log_admin("[key_name(usr)] attempting to humanize [key_name(current)]")
 						message_admins("<span class='notice'>[key_name_admin(usr)] attempting to humanize [key_name_admin(current)]</span>")
 						H = M.humanize(TR_KEEPITEMS  |  TR_KEEPIMPLANTS  |  TR_KEEPORGANS  |  TR_KEEPDAMAGE  |  TR_KEEPVIRUS  |  TR_DEFAULTMSG)

code/game/atoms.dm

@@ -412,10 +412,10 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 	. = ..()
 	transfer_blood = rand(2, 4)
 
-/turf/add_blood(list/blood_dna)
+/turf/add_blood(list/blood_dna, list/datum/disease/diseases)
 	var/obj/effect/decal/cleanable/blood/splatter/B = locate() in src
 	if(!B)
-		B = new /obj/effect/decal/cleanable/blood/splatter(src)
+		B = new /obj/effect/decal/cleanable/blood/splatter(src, diseases)
 	B.transfer_blood_dna(blood_dna) //give blood info to the blood decal.
 	return 1 //we bloodied the floor
 
@@ -524,7 +524,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 
 /atom/proc/add_vomit_floor(mob/living/carbon/M, toxvomit = 0)
 	if(isturf(src))
-		var/obj/effect/decal/cleanable/vomit/V = new /obj/effect/decal/cleanable/vomit(src)
+		var/obj/effect/decal/cleanable/vomit/V = new /obj/effect/decal/cleanable/vomit(src, M.get_static_viruses())
 		// Make toxins vomit look different
 		if(toxvomit)
 			V.icon_state = "vomittox_[pick(1,4)]"

code/game/data_huds.dm

@@ -61,16 +61,12 @@
 
 //called when a carbon changes virus
 /mob/living/carbon/proc/check_virus()
-	var/threat = 0
+	var/threat
 	for(var/thing in viruses)
 		var/datum/disease/D = thing
 		if(!(D.visibility_flags & HIDDEN_SCANNER))
-			if (D.severity != NONTHREAT) //a buffing virus gets an icon
-				threat = 2
-				return threat //harmful viruses have priority
-			else
-				threat = 1 //aka good virus
-
+			if(!threat || D.severity > threat) //a buffing virus gets an icon
+				threat = D.severity
 	return threat
 
 //helper for getting the appropriate health status
@@ -162,21 +158,30 @@
 /mob/living/carbon/med_hud_set_status()
 	var/image/holder = hud_list[STATUS_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
-	var/virus_state = check_virus()
-	var/mob/living/simple_animal/borer/B = has_brain_worms()
+	var/virus_threat = check_virus()
 	holder.pixel_y = I.Height() - world.icon_size
 	if(status_flags & XENO_HOST)
 		holder.icon_state = "hudxeno"
 	else if(stat == DEAD || (status_flags & FAKEDEATH))
 		holder.icon_state = "huddead"
-	else if(has_brain_worms() && B != null && B.controlling)
-		holder.icon_state = "hudbrainworm"
-	else if(virus_state == 2)
-		holder.icon_state = "hudill"
-	else if(virus_state == 1)
-		holder.icon_state = "hudbuff"
 	else
-		holder.icon_state = "hudhealthy"
+		switch(virus_threat)
+			if(VIRUS_SEVERITY_BIOHAZARD)
+				holder.icon_state = "hudill5"
+			if(VIRUS_SEVERITY_DANGEROUS)
+				holder.icon_state = "hudill4"
+			if(VIRUS_SEVERITY_HARMFUL)
+				holder.icon_state = "hudill3"
+			if(VIRUS_SEVERITY_MEDIUM)
+				holder.icon_state = "hudill2"
+			if(VIRUS_SEVERITY_MINOR)
+				holder.icon_state = "hudill1"
+			if(VIRUS_SEVERITY_NONTHREAT)
+				holder.icon_state = "hudill0"
+			if(VIRUS_SEVERITY_POSITIVE)
+				holder.icon_state = "hudbuff"
+			if(null)
+				holder.icon_state = "hudhealthy"
 
 
 /***********************************************

code/game/gamemodes/changeling/powers/panacea.dm

@@ -43,7 +43,7 @@
 
 	for(var/thing in user.viruses)
 		var/datum/disease/D = thing
-		if(D.severity == NONTHREAT)
+		if(D.severity == VIRUS_SEVERITY_POSITIVE)
 			continue
 		D.cure()
 	return TRUE

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -95,8 +95,8 @@ Credit where due:
 	antag_flag = ROLE_SERVANT_OF_RATVAR
 	false_report_weight = 10
 	required_players = 24
-	required_enemies = 3
-	recommended_enemies = 3
+	required_enemies = 4
+	recommended_enemies = 4
 	enemy_minimum_age = 14
 	protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //Silicons can eventually be converted
 	restricted_jobs = list("Chaplain", "Captain")
@@ -146,6 +146,7 @@ Credit where due:
 	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar //that's a mouthful
 	G.initial_activation_delay = ark_time * 60
 	G.seconds_until_activation = ark_time * 60 //60 seconds in a minute * number of minutes
+	SSshuttle.registerHostileEnvironment(GLOB.ark_of_the_clockwork_justiciar)
 	..()
 	return 1
 
@@ -183,8 +184,14 @@ Credit where due:
 		return TRUE
 	return FALSE
 
+/datum/game_mode/clockwork_cult/check_finished()
+	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
+	if(G && !GLOB.ratvar_awakens) // Doesn't end until the Ark is destroyed or completed
+		return FALSE
+	. = ..()
+
 /datum/game_mode/clockwork_cult/proc/check_clockwork_victory()
-	if(GLOB.clockwork_gateway_activated || SSshuttle.emergency.mode == SHUTTLE_ESCAPE)
+	if(GLOB.clockwork_gateway_activated)
 		SSticker.news_report = CLOCK_SUMMON
 		return TRUE
 	else
@@ -207,7 +214,7 @@ Credit where due:
 	if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) //Possibly hacky?
 		var/datum/game_mode/clockwork_cult/C = SSticker.mode
 		if(C.check_clockwork_victory())
-			text += "<span class='large_brass'><b>Ratvar's servants defended the Ark until its activation!</b></span>"
+			text += "<span class='bold large_brass'>Ratvar's servants defended the Ark until its activation!</span>"
 			SSticker.mode_result = "win - servants completed their objective (summon ratvar)"
 		else
 			text += "<span class='userdanger'>The Ark was destroyed! Ratvar will rust away for all eternity!</span>"

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -123,10 +123,9 @@
 	if(glow_type)
 		glow = new glow_type(get_turf(src))
 		animate(glow, alpha = 255, time = convert_time)
-	var/I = 0
-	while(I < convert_time && get_turf(L) == get_turf(src))
-		I++
-		sleep(1)
+	var/end_time = world.time+convert_time
+	while(world.time < end_time && get_turf(L) == get_turf(src))
+		stoplag(1)
 	if(get_turf(L) != get_turf(src))
 		if(glow)
 			qdel(glow)

code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm

@@ -55,7 +55,7 @@
 /obj/effect/clockwork/spatial_gateway/examine(mob/user)
 	..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='brass'>It has [uses] uses remaining.</span>")
+		to_chat(user, "<span class='brass'>It has [uses] use\s remaining.</span>")
 
 /obj/effect/clockwork/spatial_gateway/attack_ghost(mob/user)
 	if(linked_gateway)

code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm

@@ -122,7 +122,7 @@
 					continue
 				var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
 				to_chat(user, "<b>Quickbind</b> button: <span class='[get_component_span(initial(quickbind_slot.primary_component))]'>[initial(quickbind_slot.name)]</span>.")
-		to_chat(user, "<b>Available Power:</b> <span class='bold brass'>[DisplayPower(get_clockwork_power())]</span>")
+		to_chat(user, "<b>Available power:</b> <span class='bold brass'>[DisplayPower(get_clockwork_power())].</span>")
 
 //Slab actions; Hierophant, Quickbind
 /obj/item/clockwork/slab/ui_action_click(mob/user, action)

code/game/gamemodes/clock_cult/clock_scripture.dm

@@ -319,7 +319,7 @@ Applications: 8 servants, 3 caches, and 100 CV
 				qdel(progbar)
 			else
 				progbar.update(end_time - world.time)
-		sleep(1)
+		stoplag(1)
 	if(slab)
 		if(slab.slab_ability)
 			successful = slab.slab_ability.successful

code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm

@@ -104,6 +104,5 @@
 		if(is_servant_of_ratvar(H))
 			to_chat(H, "<span class='bold alloy'>The beacon's power warps your body into a clockwork form! You are now immune to many hazards, and your body is more robust against damage!</span>")
 			H.set_species(/datum/species/golem/clockwork/no_scrap)
-	SSshuttle.registerHostileEnvironment(GLOB.ark_of_the_clockwork_justiciar) //no leaving when we need to purge you, heretics
 	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
 	G.grace_period = FALSE //no grace period if we've declared war

code/game/gamemodes/cult/cult_items.dm

@@ -503,7 +503,7 @@
 /obj/item/device/cult_shift/examine(mob/user)
 	..()
 	if(uses)
-		to_chat(user, "<span class='cult'>It has [uses] uses remaining.</span>")
+		to_chat(user, "<span class='cult'>It has [uses] use\s remaining.</span>")
 	else
 		to_chat(user, "<span class='cult'>It seems drained.</span>")
 

code/game/gamemodes/meteor/meteors.dm

@@ -38,11 +38,9 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 		if(max_i<=0)
 			return
 	var/Me = pickweight(meteortypes)
-	var/obj/effect/meteor/M = new Me(pickedstart)
+	var/obj/effect/meteor/M = new Me(pickedstart, pickedgoal)
 	M.dest = pickedgoal
 	M.z_original = M.z
-	spawn(0)
-		walk_towards(M, M.dest, 1)
 
 /proc/spaceDebrisStartLoc(startSide, Z)
 	var/starty
@@ -124,12 +122,13 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	walk(src,0) //this cancels the walk_towards() proc
 	. = ..()
 
-/obj/effect/meteor/New()
-	..()
+/obj/effect/meteor/Initialize(mapload, target)
+	. = ..()
 	GLOB.meteor_list += src
 	SSaugury.register_doom(src, threat)
 	SpinAnimation()
 	QDEL_IN(src, lifetime)
+	chase_target(target)
 
 /obj/effect/meteor/Collide(atom/A)
 	if(A)
@@ -184,6 +183,11 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 		var/thing_to_spawn = pick(meteordrop)
 		new thing_to_spawn(get_turf(src))
 
+/obj/effect/meteor/proc/chase_target(atom/chasing, delay = 1)
+	set waitfor = FALSE
+	if(chasing)
+		walk_towards(src, chasing, delay)
+
 /obj/effect/meteor/proc/meteor_effect()
 	if(heavy)
 		var/sound/meteor_sound = sound(meteorsound)

code/game/gamemodes/miniantags/revenant/revenant_blight.dm

@@ -2,7 +2,7 @@
 	name = "Unnatural Wasting"
 	max_stages = 5
 	stage_prob = 10
-	spread_flags = NON_CONTAGIOUS
+	spread_flags = VIRUS_SPREAD_NON_CONTAGIOUS
 	cure_text = "Holy water or extensive rest."
 	spread_text = "A burst of unholy energy"
 	cures = list("holywater")
@@ -11,7 +11,7 @@
 	viable_mobtypes = list(/mob/living/carbon/human)
 	disease_flags = CURABLE
 	permeability_mod = 1
-	severity = BIOHAZARD
+	severity = VIRUS_SEVERITY_HARMFUL
 	var/stagedamage = 0 //Highest stage reached.
 	var/finalstage = 0 //Because we're spawning off the cure in the final stage, we need to check if we've done the final stage's effects.
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -82,9 +82,7 @@
 
 /datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, nuke_code)
 	var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")
-	spawn(1)
-		nukeops_lastname = nukelastname(synd_mind.current)
-		NukeNameAssign(nukeops_lastname,syndicates) //allows time for the rest of the syndies to be chosen
+	addtimer(CALLBACK(src, .proc/nuketeam_name_assign, synd_mind), 1)
 	synd_mind.current.real_name = "[syndicate_name()] [leader_title]"
 	to_chat(synd_mind.current, "<B>You are the Syndicate [leader_title] for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.</B>")
 	to_chat(synd_mind.current, "<B>If you feel you are not up to this task, give your ID to another operative.</B>")
@@ -116,6 +114,9 @@
 		nuke_code = "code will be provided later"
 	return
 
+/datum/game_mode/proc/nuketeam_name_assign(datum/mind/synd_mind)
+	nukeops_lastname = nukelastname(synd_mind.current)
+	NukeNameAssign(nukeops_lastname, syndicates)
 
 
 /datum/game_mode/proc/forge_syndicate_objectives(datum/mind/syndicate)
@@ -136,7 +137,7 @@
 		synd_mob.equipOutfit(/datum/outfit/syndicate)
 	else
 		synd_mob.equipOutfit(/datum/outfit/syndicate/no_crystals)
-	return 1
+	return TRUE
 
 /datum/game_mode/nuclear/OnNukeExplosion(off_station)
 	..()
@@ -147,25 +148,25 @@
 
 /datum/game_mode/nuclear/check_win()
 	if (nukes_left == 0)
-		return 1
+		return TRUE
 	return ..()
 
 /datum/game_mode/proc/are_operatives_dead()
 	for(var/datum/mind/operative_mind in syndicates)
 		if(ishuman(operative_mind.current) && (operative_mind.current.stat!=2))
-			return 0
-	return 1
+			return FALSE
+	return TRUE
 
 /datum/game_mode/nuclear/check_finished() //to be called by SSticker
 	if(replacementmode && round_converted == 2)
 		return replacementmode.check_finished()
 	if((SSshuttle.emergency.mode == SHUTTLE_ENDGAME) || station_was_nuked)
-		return 1
+		return TRUE
 	if(are_operatives_dead())
 		var/obj/machinery/nuclearbomb/N
 		pass(N)	//suppress unused warning
 		if(N.bomb_set) //snaaaaaaaaaake! It's not over yet!
-			return 0	//its a static var btw
+			return FALSE	//its a static var btw
 	..()
 
 /datum/game_mode/nuclear/declare_completion()
@@ -278,7 +279,7 @@
 		if(TC_uses == 0 && station_was_nuked && !are_operatives_dead())
 			text += "<BIG>[icon2html('icons/badass.dmi', world, "badass")]</BIG>"
 		to_chat(world, text)
-	return 1
+	return TRUE
 
 
 /proc/nukelastname(mob/M) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho.

code/game/gamemodes/nuclear/pinpointer.dm

@@ -16,7 +16,7 @@
 	to_chat(user, msg)
 	for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)
 		if(bomb.timing)
-			to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]")
+			to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()].")
 
 /obj/item/pinpointer/nuke/process()
 	..()

code/game/gamemodes/revolution/revolution.dm

@@ -59,10 +59,9 @@
 		lenin.restricted_roles = restricted_jobs
 
 	if(head_revolutionaries.len < required_enemies)
-		return 0
-
-	return 1
+		return FALSE
 
+	return TRUE
 
 /datum/game_mode/revolution/post_setup()
 	var/list/heads = get_living_heads()
@@ -102,10 +101,7 @@
 		for(var/datum/mind/head_mind in heads)
 			mark_for_death(rev_mind, head_mind)
 
-		spawn(rand(10,100))
-		//	equip_traitor(rev_mind.current, 1) //changing how revs get assigned their uplink so they can get PDA uplinks. --NEO
-		//	Removing revolutionary uplinks.	-Pete
-			equip_revolutionary(rev_mind.current)
+		addtimer(CALLBACK(src, .proc/equip_revolutionary, rev_mind.current), rand(10, 100))
 
 	for(var/datum/mind/rev_mind in head_revolutionaries)
 		greet_revolutionary(rev_mind)
@@ -121,7 +117,7 @@
 			check_heads()
 			SSticker.mode.check_win()
 		check_counter = 0
-	return 0
+	return FALSE
 
 
 /datum/game_mode/proc/forge_revolutionary_objectives(datum/mind/rev_mind)
@@ -169,7 +165,7 @@
 		to_chat(mob, "The Syndicate were unfortunately unable to get you a flash.")
 	else
 		to_chat(mob, "The flash in your [where] will help you to persuade the crew to join your cause.")
-		return 1
+		return TRUE
 
 /////////////////////////////////
 //Gives head revs their targets//
@@ -235,7 +231,7 @@
 			SSshuttle.clearHostileEnvironment(src)
 		return ..()
 	if(finished != 0)
-		return 1
+		return TRUE
 	else
 		return ..()
 
@@ -321,9 +317,9 @@
 	for(var/datum/mind/rev_mind in head_revolutionaries)
 		for(var/datum/objective/mutiny/objective in rev_mind.objectives)
 			if(!(objective.check_completion()))
-				return 0
+				return FALSE
 
-		return 1
+		return TRUE
 
 /////////////////////////////
 //Checks for a head victory//
@@ -333,8 +329,8 @@
 		var/turf/T = get_turf(rev_mind.current)
 		if(!considered_afk(rev_mind) && considered_alive(rev_mind) && (T.z in GLOB.station_z_levels))
 			if(ishuman(rev_mind.current))
-				return 0
-	return 1
+				return FALSE
+	return TRUE
 
 //////////////////////////////////////////////////////////////////////
 //Announces the end of the game with all relavent information stated//
@@ -352,7 +348,7 @@
 
 		SSticker.news_report = REVS_LOSE
 	..()
-	return 1
+	return TRUE
 
 /datum/game_mode/proc/auto_declare_completion_revolution()
 	var/list/targets = list()

code/game/machinery/Sleeper.dm

@@ -174,7 +174,7 @@
 
 /obj/machinery/sleeper/emag_act(mob/user)
 	scramble_chem_buttons()
-	to_chat(user, "<span class='warning'>You scramble the sleepers user interface!</span>")
+	to_chat(user, "<span class='warning'>You scramble the sleeper's user interface!</span>")
 
 /obj/machinery/sleeper/proc/inject_chem(chem)
 	if((chem in available_chems) && chem_allowed(chem))

code/game/machinery/_machinery.dm

@@ -443,14 +443,14 @@ Class Procs:
 	return 0
 
 /obj/machinery/proc/display_parts(mob/user)
-	to_chat(user, "<span class='notice'>Following parts detected in the machine:</span>")
+	to_chat(user, "<span class='notice'>It contains the following parts:</span>")
 	for(var/obj/item/C in component_parts)
-		to_chat(user, "<span class='notice'>[icon2html(C, user)] [C.name]</span>")
+		to_chat(user, "<span class='notice'>[icon2html(C, user)] \A [C].</span>")
 
 /obj/machinery/examine(mob/user)
 	..()
 	if(stat & BROKEN)
-		to_chat(user, "<span class='notice'>It looks broken and non functional.</span>")
+		to_chat(user, "<span class='notice'>It looks broken and non-functional.</span>")
 	if(!(resistance_flags & INDESTRUCTIBLE))
 		if(resistance_flags & ON_FIRE)
 			to_chat(user, "<span class='warning'>It's on fire!</span>")

code/game/machinery/cell_charger.dm

@@ -27,7 +27,7 @@
 	..()
 	to_chat(user, "There's [charging ? "a" : "no"] cell in the charger.")
 	if(charging)
-		to_chat(user, "Current charge: [round(charging.percent(), 1)]%")
+		to_chat(user, "Current charge: [round(charging.percent(), 1)]%.")
 
 /obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stock_parts/cell))

code/game/machinery/dance_machine.dm

@@ -381,7 +381,7 @@
 				initial_matrix = matrix(M.transform)
 				initial_matrix.Translate(-3,0)
 				animate(M, transform = initial_matrix, time = 1, loop = 0)
-		sleep (1)
+		sleep(1)
 	M.lying_fix()
 
 
@@ -428,7 +428,7 @@
 				initial_matrix = matrix(M.transform)
 				initial_matrix.Translate(-3,0)
 				animate(M, transform = initial_matrix, time = 1, loop = 0)
-		sleep (1)
+		sleep(1)
 	M.lying_fix()
 
 

code/game/machinery/doors/airlock.dm

@@ -568,24 +568,24 @@
 	if(panel_open)
 		switch(security_level)
 			if(AIRLOCK_SECURITY_NONE)
-				to_chat(user, "Wires are exposed!")
+				to_chat(user, "Its wires are exposed!")
 			if(AIRLOCK_SECURITY_METAL)
-				to_chat(user, "Wires are hidden behind welded metal cover")
+				to_chat(user, "Its wires are hidden behind a welded metal cover.")
 			if(AIRLOCK_SECURITY_PLASTEEL_I_S)
-				to_chat(user, "There is some shredded plasteel inside")
+				to_chat(user, "There is some shredded plasteel inside.")
 			if(AIRLOCK_SECURITY_PLASTEEL_I)
-				to_chat(user, "Wires are behind inner layer of plasteel")
+				to_chat(user, "Its wires are behind an inner layer of plasteel.")
 			if(AIRLOCK_SECURITY_PLASTEEL_O_S)
-				to_chat(user, "There is some shredded plasteel inside")
+				to_chat(user, "There is some shredded plasteel inside.")
 			if(AIRLOCK_SECURITY_PLASTEEL_O)
-				to_chat(user, "There is welded plasteel cover hiding wires")
+				to_chat(user, "There is a welded plasteel cover hiding its wires.")
 			if(AIRLOCK_SECURITY_PLASTEEL)
-				to_chat(user, "There is protective grille over panel")
+				to_chat(user, "There is a protective grille over its panel.")
 	else if(security_level)
 		if(security_level == AIRLOCK_SECURITY_METAL)
-			to_chat(user, "It looks a bit stronger")
+			to_chat(user, "It looks a bit stronger.")
 		else
-			to_chat(user, "It looks very robust")
+			to_chat(user, "It looks very robust.")
 
 /obj/machinery/door/airlock/attack_ai(mob/user)
 	if(!src.canAIControl(user))
@@ -1015,7 +1015,7 @@
 					if(S.get_amount() < 2)
 						to_chat(user, "<span class='warning'>You need at least 2 metal sheets to reinforce [src].</span>")
 						return
-					to_chat(user, "<span class='notice'>You start reinforcing [src]</span>")
+					to_chat(user, "<span class='notice'>You start reinforcing [src].</span>")
 					if(do_after(user, 20, 1, target = src))
 						if(!panel_open || !S.use(2))
 							return

code/game/machinery/doors/firedoor.dm

@@ -33,14 +33,12 @@
 	..()
 	if(!density)
 		to_chat(user, "<span class='notice'>It is open, but could be <b>pried</b> closed.</span>")
+	else if(!welded)
+		to_chat(user, "<span class='notice'>It is closed, but could be <i>pried</i> open. Deconstruction would require it to be <b>welded</b> shut.</span>")
+	else if(boltslocked)
+		to_chat(user, "<span class='notice'>It is <i>welded</i> shut. The floor bolts have been locked by <b>screws</b>.</span>")
 	else
-		if(!welded)
-			to_chat(user, "<span class='notice'>It is closed, but could be <i>pried</i> open. Deconstruction would require it to be <b>welded</b> shut.</span>")
-		else
-			if(boltslocked)
-				to_chat(user, "<span class='notice'>It is <i>welded</i> shut. The floor bolt have been locked by <b>screws</b>.</span>")
-			else
-				to_chat(user, "<span class='notice'>The bolt locks have been <i>unscrewed</i>, but the bolts themselves are still <b>wrenched</b> to the floor.</span>")
+		to_chat(user, "<span class='notice'>The bolt locks have been <i>unscrewed</i>, but the bolts themselves are still <b>wrenched</b> to the floor.</span>")
 
 /obj/machinery/door/firedoor/proc/CalculateAffectingAreas()
 	remove_from_areas()

code/game/machinery/droneDispenser.dm

@@ -4,9 +4,7 @@
 
 /obj/machinery/droneDispenser //Most customizable machine 2015
 	name = "drone shell dispenser"
-	desc = "A hefty machine that, when supplied with metal and glass, \
-		will periodically create a drone shell. \
-		Does not need to be manually operated."
+	desc = "A hefty machine that, when supplied with metal and glass, will periodically create a drone shell. Does not need to be manually operated."
 
 	icon = 'icons/obj/machines/droneDispenser.dmi'
 	icon_state = "on"
@@ -46,8 +44,7 @@
 	var/begin_create_message = "whirs to life!"
 	var/end_create_message = "dispenses a drone shell."
 	var/recharge_message = "pings."
-	var/recharging_text = "It is whirring and clicking. \
-		It seems to be recharging."
+	var/recharging_text = "It is whirring and clicking. It seems to be recharging."
 
 	var/break_message = "lets out a tinny alarm before falling dark."
 	var/break_sound = 'sound/machines/warning-buzzer.ogg'
@@ -56,6 +53,7 @@
 	. = ..()
 	var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE)
 	materials.insert_amount(starting_amount)
+	materials.precise_insertion = TRUE
 	using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost)
 
 /obj/machinery/droneDispenser/preloaded
@@ -72,18 +70,14 @@
 
 /obj/machinery/droneDispenser/syndrone/badass //Please forgive me
 	name = "badass syndrone shell dispenser"
-	desc = "A suspicious machine that will create Syndicate \
-		exterminator drones when supplied with metal and glass. \
-		Disgusting. This one seems ominous."
+	desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting. This one seems ominous."
 	dispense_type = /obj/item/drone_shell/syndrone/badass
 	end_create_message = "dispenses an ominous suspicious drone shell."
 
 // I don't need your forgiveness, this is awesome.
 /obj/machinery/droneDispenser/snowflake
 	name = "snowflake drone shell dispenser"
-	desc = "A hefty machine that, when supplied with metal and glass, \
-		will periodically create a snowflake drone shell. \
-		Does not need to be manually operated."
+	desc = "A hefty machine that, when supplied with metal and glass, will periodically create a snowflake drone shell. Does not need to be manually operated."
 	dispense_type = /obj/item/drone_shell/snowflake
 	end_create_message = "dispenses a snowflake drone shell."
 	// Those holoprojectors aren't cheap
@@ -96,8 +90,7 @@
 // This one requires no materials and creates basic hivebots
 /obj/machinery/droneDispenser/hivebot
 	name = "hivebot fabricator"
-	desc = "A large, bulky machine that whirs with activity, \
-		steam hissing from vents in its sides."
+	desc = "A large, bulky machine that whirs with activity, steam hissing from vents in its sides."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "hivebot_fab"
 	icon_off = "hivebot_fab"
@@ -110,14 +103,13 @@
 	cooldownTime = 10 //Only 1 second - hivebots are extremely weak
 	dispense_type = /mob/living/simple_animal/hostile/hivebot
 	begin_create_message = "closes and begins fabricating something within."
-	end_create_message = "slams open, revealing out a hivebot!"
+	end_create_message = "slams open, revealing a hivebot!"
 	recharge_sound = null
 	recharge_message = null
 
 /obj/machinery/droneDispenser/swarmer
 	name = "swarmer fabricator"
-	desc = "An alien machine of unknown origin. \
-		It whirs and hums with green-blue light, the air above it shimmering."
+	desc = "An alien machine of unknown origin. It whirs and hums with green-blue light, the air above it shimmering."
 	icon = 'icons/obj/machines/gateway.dmi'
 	icon_state = "toffcenter"
 	icon_off = "toffcenter"
@@ -129,10 +121,8 @@
 	cooldownTime = 300 //30 seconds
 	maximum_idle = 0 // Swarmers have no restraint
 	dispense_type = /obj/effect/mob_spawn/swarmer
-	begin_create_message = "hums softly as an interface appears above it, \
-		scrolling by at unreadable speed."
-	end_create_message = "materializes a strange shell, which drops to the \
-		ground."
+	begin_create_message = "hums softly as an interface appears above it, scrolling by at unreadable speed."
+	end_create_message = "materializes a strange shell, which drops to the ground."
 	recharging_text = "Its lights are slowly increasing in brightness."
 	work_sound = 'sound/effects/empulse.ogg'
 	create_sound = 'sound/effects/phasein.ogg'
@@ -171,8 +161,7 @@
 			if(maximum_idle && (count_shells() >= maximum_idle))
 				return // then do nothing; check again next tick
 			if(begin_create_message)
-				visible_message("<span class='notice'>\
-					[src] [begin_create_message]</span>")
+				visible_message("<span class='notice'>[src] [begin_create_message]</span>")
 			if(work_sound)
 				playsound(src, work_sound, 50, 1)
 			mode = DRONE_PRODUCTION
@@ -190,8 +179,7 @@
 			if(create_sound)
 				playsound(src, create_sound, 50, 1)
 			if(end_create_message)
-				visible_message("<span class='notice'>[src] \
-					[end_create_message]</span>")
+				visible_message("<span class='notice'>[src] [end_create_message]</span>")
 
 			mode = DRONE_RECHARGING
 			timer = world.time + cooldownTime
@@ -201,8 +189,7 @@
 			if(recharge_sound)
 				playsound(src, recharge_sound, 50, 1)
 			if(recharge_message)
-				visible_message("<span class='notice'>\
-					[src] [recharge_message]</span>")
+				visible_message("<span class='notice'>[src] [recharge_message]</span>")
 
 			mode = DRONE_READY
 			update_icon()
@@ -246,10 +233,8 @@
 
 		playsound(src, WT.usesound, 50, 1)
 		user.visible_message(
-			"<span class='notice'>[user] begins patching up \
-				[src] with [WT].</span>",
-			"<span class='notice'>You begin restoring the \
-				damage to [src]...</span>")
+			"<span class='notice'>[user] begins patching up [src] with [WT].</span>",
+			"<span class='notice'>You begin restoring the damage to [src]...</span>")
 
 		if(!do_after(user, 40*O.toolspeed, target = src))
 			return
@@ -270,8 +255,7 @@
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!(stat & BROKEN))
 			if(break_message)
-				audible_message("<span class='warning'>[src] \
-					[break_message]</span>")
+				audible_message("<span class='warning'>[src] [break_message]</span>")
 			if(break_sound)
 				playsound(src, break_sound, 50, 1)
 			stat |= BROKEN

code/game/machinery/status_display.dm

@@ -123,10 +123,37 @@
 /obj/machinery/status_display/examine(mob/user)
 	. = ..()
 	switch(mode)
-		if(1,2,4,5)
-			to_chat(user, "The display says:<br>\t<xmp>[message1]</xmp><br>\t<xmp>[message2]</xmp>")
-	if(mode == 1 && SSshuttle.emergency)
-		to_chat(user, "Current Shuttle: [SSshuttle.emergency.name]")
+		if(1,5)  // Emergency or generic shuttle
+			var/obj/docking_port/mobile/shuttle
+			if(mode == 1)
+				shuttle = SSshuttle.emergency
+			else
+				shuttle = SSshuttle.getShuttle(shuttle_id)
+
+			if (!shuttle)
+				to_chat(user, "The display says:<br>\t<xmp>Shuttle?</xmp>")
+			else if (shuttle.timer)
+				to_chat(user, "The display says:<br>\t<xmp>[shuttle.getModeStr()]: [shuttle.getTimerStr()]</xmp>")
+			if (mode == 1 && shuttle)
+				to_chat(user, "Current shuttle: [shuttle.name].")
+		if(4)  // Supply shuttle
+			var/obj/docking_port/mobile/shuttle = SSshuttle.supply
+			var/shuttleMsg = null
+			if (shuttle.mode == SHUTTLE_IDLE)
+				if (shuttle.z in GLOB.station_z_levels)
+					shuttleMsg = "Docked"
+			else
+				shuttleMsg = "[shuttle.getModeStr()]: [shuttle.getTimerStr()]"
+			if (shuttleMsg)
+				to_chat(user, "The display says:<br>\t<xmp>[shuttleMsg]</xmp>")
+		if(2)  // Custom message
+			if (message1 || message2)
+				var/msg = "The display says:"
+				if (message1)
+					msg += "<br>\t<xmp>[message1]</xmp>"
+				if (message2)
+					msg += "<br>\t<xmp>[message2]</xmp>"
+				to_chat(user, msg)
 
 
 /obj/machinery/status_display/proc/set_message(m1, m2)

code/game/mecha/mech_fabricator.dm

@@ -35,9 +35,10 @@
 								)
 
 /obj/machinery/mecha_part_fabricator/Initialize()
-	AddComponent(/datum/component/material_container,
+	var/datum/component/material_container/materials = AddComponent(/datum/component/material_container,
 	 list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
 		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
+	materials.precise_insertion = TRUE
 	. = ..()
 	files = new /datum/research(src) //Setup the research data holder.
 

code/game/mecha/mecha.dm

@@ -276,7 +276,7 @@
 	if(equipment && equipment.len)
 		to_chat(user, "It's equipped with:")
 		for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment)
-			to_chat(user, "[icon2html(ME, user)] [ME]")
+			to_chat(user, "[icon2html(ME, user)] \A [ME].")
 
 //processing internal damage, temperature, air regulation, alert updates, lights power use.
 /obj/mecha/process()

code/game/objects/effects/countdown.dm

@@ -20,7 +20,7 @@
 
 /obj/effect/countdown/examine(mob/user)
 	. = ..()
-	to_chat(user, "This countdown is displaying: [displayed_text]")
+	to_chat(user, "This countdown is displaying: [displayed_text].")
 
 /obj/effect/countdown/proc/attach(atom/A)
 	attached_to = A

code/game/objects/effects/decals/cleanable.dm

@@ -6,7 +6,7 @@
 	var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
 	var/mergeable_decal = 1 //when two of these are on a same tile or do we need to merge them into just one?
 
-/obj/effect/decal/cleanable/Initialize(mapload)
+/obj/effect/decal/cleanable/Initialize(mapload, list/datum/disease/diseases)
 	if (random_icon_states && length(src.random_icon_states) > 0)
 		src.icon_state = pick(src.random_icon_states)
 	create_reagents(300)
@@ -14,10 +14,15 @@
 		for(var/obj/effect/decal/cleanable/C in src.loc)
 			if(C != src && C.type == src.type)
 				replace_decal(C)
+	if(LAZYLEN(diseases))
+		var/list/datum/disease/diseases_to_add = list()
+		for(var/datum/disease/D in diseases)
+			if(D.spread_flags & VIRUS_SPREAD_CONTACT_FLUIDS)
+				diseases_to_add += D
+		if(LAZYLEN(diseases_to_add))
+			AddComponent(/datum/component/infective, diseases_to_add)
 	. = ..()
 
-
-
 /obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C)
 	if(mergeable_decal)
 		qdel(C)
@@ -65,6 +70,7 @@
 //Add "bloodiness" of this blood's type, to the human's shoes
 //This is on /cleanable because fuck this ancient mess
 /obj/effect/decal/cleanable/Crossed(atom/movable/O)
+	..()
 	if(ishuman(O))
 		var/mob/living/carbon/human/H = O
 		if(H.shoes && blood_state && bloodiness)

code/game/objects/effects/decals/cleanable/humans.dm

@@ -18,7 +18,7 @@
 	desc = "Looks like it's been here a while.  Eew."
 	bloodiness = 0
 
-/obj/effect/decal/cleanable/blood/old/Initialize()
+/obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
 	icon_state += "-old" //This IS necessary because the parent /blood type uses icon randomization.
 	blood_DNA["Non-human DNA"] = "A+"
@@ -39,7 +39,6 @@
 	var/list/existing_dirs = list()
 	blood_DNA = list()
 
-
 /obj/effect/decal/cleanable/trail_holder/can_bloodcrawl_in()
 	return 1
 
@@ -53,7 +52,7 @@
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
 	mergeable_decal = 0
 
-/obj/effect/decal/cleanable/blood/gibs/Initialize()
+/obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
 	reagents.add_reagent("liquidgibs", 5)
 
@@ -66,7 +65,11 @@
 	for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
 		sleep(2)
 		if(i > 0)
-			new /obj/effect/decal/cleanable/blood/splatter(loc)
+			var/list/datum/disease/diseases
+			GET_COMPONENT(infective, /datum/component/infective)
+			if(infective)
+				diseases = infective.diseases
+			new /obj/effect/decal/cleanable/blood/splatter(loc, diseases)
 		if(!step_to(src, get_step(src, direction), 0))
 			break
 
@@ -93,7 +96,7 @@
 	desc = "Space Jesus, why didn't anyone clean this up?  It smells terrible."
 	bloodiness = 0
 
-/obj/effect/decal/cleanable/blood/gibs/old/Initialize()
+/obj/effect/decal/cleanable/blood/gibs/old/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
 	setDir(pick(1,2,4,8))
 	icon_state += "-old"
@@ -126,6 +129,7 @@
 	var/list/shoe_types = list()
 
 /obj/effect/decal/cleanable/blood/footprints/Crossed(atom/movable/O)
+	..()
 	if(ishuman(O))
 		var/mob/living/carbon/human/H = O
 		var/obj/item/clothing/shoes/S = H.shoes
@@ -136,6 +140,7 @@
 	update_icon()
 
 /obj/effect/decal/cleanable/blood/footprints/Uncrossed(atom/movable/O)
+	..()
 	if(ishuman(O))
 		var/mob/living/carbon/human/H = O
 		var/obj/item/clothing/shoes/S = H.shoes
@@ -169,7 +174,7 @@
 		. += "You recognise the footprints as belonging to:\n"
 		for(var/shoe in shoe_types)
 			var/obj/item/clothing/shoes/S = shoe
-			. += "some <B>[initial(S.name)]</B> [icon2html(initial(S.icon), user)]\n"
+			. += "[icon2html(initial(S.icon), user)] Some <B>[initial(S.name)]</B>.\n"
 
 	to_chat(user, .)
 

code/game/objects/effects/decals/cleanable/misc.dm

@@ -101,7 +101,7 @@
 	name = "crusty dried vomit"
 	desc = "You try not to look at the chunks, and fail."
 
-/obj/effect/decal/cleanable/vomit/old/Initialize()
+/obj/effect/decal/cleanable/vomit/old/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
 	icon_state += "-old"
 

code/game/objects/effects/effect_system/effects_explosion.dm

@@ -13,13 +13,11 @@
 
 /datum/effect_system/expl_particles/start()
 	for(var/i in 1 to number)
-		spawn(0)
-			var/obj/effect/particle_effect/expl_particles/expl = new /obj/effect/particle_effect/expl_particles(location)
-			var/direct = pick(GLOB.alldirs)
-			var/steps_amt = pick(1;25,2;50,3,4;200)
-			for(var/j in 1 to steps_amt)
-				sleep(1)
-				step(expl,direct)
+		var/obj/effect/particle_effect/expl_particles/expl = new /obj/effect/particle_effect/expl_particles(location)
+		var/direct = pick(GLOB.alldirs)
+		var/steps_amt = pick(1;25,2;50,3,4;200)
+		for(var/j in 1 to steps_amt)
+			addtimer(CALLBACK(src, .proc/_step, expl, direct), j)
 
 /obj/effect/explosion
 	name = "fire"
@@ -51,9 +49,10 @@
 
 /datum/effect_system/explosion/smoke
 
+/datum/effect_system/explosion/smoke/proc/create_smoke()
+	var/datum/effect_system/smoke_spread/S = new
+	S.set_up(2, location)
+	S.start()
 /datum/effect_system/explosion/smoke/start()
 	..()
-	spawn(5)
-		var/datum/effect_system/smoke_spread/S = new
-		S.set_up(2, location)
-		S.start()
+	addtimer(CALLBACK(src, .proc/create_smoke), 5)

code/game/objects/effects/spawners/gibspawner.dm

@@ -6,7 +6,7 @@
 	var/list/gibamounts = list() //amount to spawn for each gib decal type we'll spawn.
 	var/list/gibdirections = list() //of lists of possible directions to spread each gib decal type towards.
 
-/obj/effect/gibspawner/Initialize(mapload, datum/dna/MobDNA)
+/obj/effect/gibspawner/Initialize(mapload, datum/dna/MobDNA, list/datum/disease/diseases)
 	. = ..()
 
 	if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
@@ -24,7 +24,7 @@
 		if(gibamounts[i])
 			for(var/j = 1, j<= gibamounts[i], j++)
 				var/gibType = gibtypes[i]
-				gib = new gibType(loc)
+				gib = new gibType(loc, diseases)
 				if(iscarbon(loc))
 					var/mob/living/carbon/digester = loc
 					digester.stomach_contents += gib

code/game/objects/items.dm

@@ -344,7 +344,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 					var/datum/progressbar/progress = new(user, len, loc)
 
 					while (do_after(user, 10, TRUE, S, FALSE, CALLBACK(src, .proc/handle_mass_pickup, S, things, loc, rejections, progress)))
-						sleep(1)
+						stoplag(1)
 
 					qdel(progress)
 

code/game/objects/items/bodybag.dm

@@ -36,7 +36,8 @@
 /obj/item/bodybag/bluespace/examine(mob/user)
 	..()
 	if(contents.len)
-		to_chat(user, "<span class='notice'>You can make out the shapes of [contents.len] objects through the fabric.</span>")
+		var/s = contents.len == 1 ? "" : "s"
+		to_chat(user, "<span class='notice'>You can make out the shape[s] of [contents.len] object[s] through the fabric.</span>")
 
 /obj/item/bodybag/bluespace/Destroy()
 	for(var/atom/movable/A in contents)

code/game/objects/items/cigs_lighters.dm

@@ -157,6 +157,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
 	if(lit)
 		return
+	if(!initialized)
+		icon_state = icon_on
+		item_state = icon_on
+		return
 
 	lit = TRUE
 	name = "lit [name]"

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -598,6 +598,17 @@
 		/obj/item/stock_parts/cell = 1)
 	def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
 
+/obj/item/circuitboard/machine/smoke_machine
+	name = "Smoke Machine (Machine Board)"
+	build_path = /obj/machinery/smoke_machine
+	origin_tech = "materials=4;engineering=3;biotech=3"
+	req_components = list(
+		/obj/item/stock_parts/matter_bin = 2,
+		/obj/item/stock_parts/capacitor = 1,
+		/obj/item/stock_parts/manipulator = 1,
+		/obj/item/stock_parts/console_screen = 1,
+		/obj/item/stock_parts/cell = 1)
+
 /obj/item/circuitboard/machine/chem_heater
 	name = "Chemical Heater (Machine Board)"
 	build_path = /obj/machinery/chem_heater

code/game/objects/items/crayons.dm

@@ -549,7 +549,7 @@
 /obj/item/toy/crayon/spraycan/examine(mob/user)
 	. = ..()
 	if(charges_left)
-		to_chat(user, "It has [charges_left] uses left.")
+		to_chat(user, "It has [charges_left] use\s left.")
 	else
 		to_chat(user, "It is empty.")
 

code/game/objects/items/devices/radio/electropack.dm

@@ -162,8 +162,9 @@ Code:
 /obj/item/device/electropack/shockcollar/attack_hand(mob/user)
 	if(loc == user)
 		if(slot_flags == SLOT_NECK)
-			to_chat(user, "<span class='warning'>The collar is fastened tight! You'll need help taking this off!</span>")
-			return
+			if(user.get_item_by_slot(slot_neck))
+				to_chat(user, "<span class='warning'>The collar is fastened tight! You'll need help taking this off!</span>")
+				return
 	..()
 
 /obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal)

code/game/objects/items/devices/radio/radio.dm

@@ -512,9 +512,9 @@
 /obj/item/device/radio/examine(mob/user)
 	..()
 	if (b_stat)
-		to_chat(user, "<span class='notice'>[name] can be attached and modified.</span>")
+		to_chat(user, "<span class='notice'>It can be attached and modified.</span>")
 	else
-		to_chat(user, "<span class='notice'>[name] can not be modified or attached.</span>")
+		to_chat(user, "<span class='notice'>It cannot be modified or attached.</span>")
 
 /obj/item/device/radio/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)

code/game/objects/items/extinguisher.dm

@@ -68,7 +68,7 @@
 /obj/item/extinguisher/examine(mob/user)
 	..()
 	if(reagents.total_volume)
-		to_chat(user, "It contains [round(reagents.total_volume)] units.")
+		to_chat(user, "It contains [round(reagents.total_volume)] unit\s.")
 		to_chat(user, "<span class='notice'>Alt-click to empty it.</span>")
 	else
 		to_chat(user, "It is empty.")

code/game/objects/items/flamethrower.dm

@@ -144,7 +144,7 @@
 /obj/item/flamethrower/examine(mob/user)
 	..()
 	if(ptank)
-		to_chat(user, "<span class='notice'>\The [src] has \the [ptank] attached. Alt-click to remove it.</span>")
+		to_chat(user, "<span class='notice'>\The [src] has \a [ptank] attached. Alt-click to remove it.</span>")
 
 /obj/item/flamethrower/proc/toggle_igniter(mob/user)
 	if(!ptank)

code/game/objects/items/inducer.dm

@@ -48,15 +48,15 @@
 
 /obj/item/inducer/proc/cantbeused(mob/user)
 	if(!user.IsAdvancedToolUser())
-		to_chat(user, "<span class='warning'>You don't have the dexterity to use \the [src]!</span>")
+		to_chat(user, "<span class='warning'>You don't have the dexterity to use [src]!</span>")
 		return TRUE
 
 	if(!cell)
-		to_chat(user, "<span class='warning'>\The [src] doesn't have a power cell installed!</span>")
+		to_chat(user, "<span class='warning'>[src] doesn't have a power cell installed!</span>")
 		return TRUE
 
 	if(!cell.charge)
-		to_chat(user, "<span class='warning'>\The [src]'s battery is dead!</span>")
+		to_chat(user, "<span class='warning'>[src]'s battery is dead!</span>")
 		return TRUE
 	return FALSE
 
@@ -79,12 +79,12 @@
 			if(!cell)
 				if(!user.transferItemToLoc(W, src))
 					return
-				to_chat(user, "<span class='notice'>You insert \the [W] into \the [src].</span>")
+				to_chat(user, "<span class='notice'>You insert [W] into [src].</span>")
 				cell = W
 				update_icon()
 				return
 			else
-				to_chat(user, "<span class='notice'>\The [src] already has \a [cell] installed!</span>")
+				to_chat(user, "<span class='notice'>[src] already has \a [cell] installed!</span>")
 				return
 
 	if(cantbeused(user))
@@ -110,15 +110,17 @@
 	if(istype(A, /obj))
 		O = A
 	if(C)
+		var/done_any = FALSE
 		if(C.charge >= C.maxcharge)
-			to_chat(user, "<span class='notice'>\The [A] is fully charged!</span>")
+			to_chat(user, "<span class='notice'>[A] is fully charged!</span>")
 			recharging = FALSE
 			return TRUE
-		user.visible_message("[user] starts recharging \the [A] with \the [src]","<span class='notice'>You start recharging [A] with \the [src]</span>")
+		user.visible_message("[user] starts recharging [A] with [src].","<span class='notice'>You start recharging [A] with [src].</span>")
 		while(C.charge < C.maxcharge)
 			if(E)
 				E.chambered = null  // Prevents someone from firing continuously while recharging the gun.
 			if(do_after(user, 10, target = user) && cell.charge)
+				done_any = TRUE
 				induce(C, coefficient)
 				do_sparks(1, FALSE, A)
 				if(O)
@@ -127,7 +129,8 @@
 				break
 		if(E)
 			E.recharge_newshot() //We're done charging, so we'll let someone fire it now.
-		user.visible_message("[user] recharged \the [A]!","<span class='notice'>You recharged \the [A]!</span>")
+		if(done_any) // Only show a message if we succeeded at least once
+			user.visible_message("[user] recharged [A]!","<span class='notice'>You recharged [A]!</span>")
 		recharging = FALSE
 		return TRUE
 	recharging = FALSE
@@ -147,7 +150,7 @@
 
 /obj/item/inducer/attack_self(mob/user)
 	if(opened && cell)
-		user.visible_message("[user] removes \the [cell] from \the [src]!","<span class='notice'>You remove \the [cell].</span>")
+		user.visible_message("[user] removes [cell] from [src]!","<span class='notice'>You remove [cell].</span>")
 		cell.update_icon()
 		user.put_in_hands(cell)
 		cell = null
@@ -157,11 +160,11 @@
 /obj/item/inducer/examine(mob/living/M)
 	..()
 	if(cell)
-		to_chat(M, "<span class='notice'>It's display shows: [DisplayPower(cell.charge)]</span>")
+		to_chat(M, "<span class='notice'>Its display shows: [DisplayPower(cell.charge)].</span>")
 	else
-		to_chat(M,"<span class='notice'>It's display is dark.</span>")
+		to_chat(M,"<span class='notice'>Its display is dark.</span>")
 	if(opened)
-		to_chat(M,"<span class='notice'>It's battery compartment is open.</span>")
+		to_chat(M,"<span class='notice'>Its battery compartment is open.</span>")
 
 /obj/item/inducer/update_icon()
 	cut_overlays()
@@ -174,7 +177,7 @@
 /obj/item/inducer/sci
 	icon_state = "inducer-sci"
 	item_state = "inducer-sci"
-	desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than it's engineering counterpart."
+	desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than its engineering counterpart."
 	cell_type = null
 	powertransfer = 500
 	opened = TRUE

code/game/objects/items/pneumaticCannon.dm

@@ -38,10 +38,10 @@
 		out += "<span class='notice'>You'll need to get closer to see any more.</span>"
 		return
 	for(var/obj/item/I in loadedItems)
-		out += "<span class='info'>[icon2html(I, user)] It has \the [I] loaded.</span>"
+		out += "<span class='info'>[icon2html(I, user)] It has \a [I] loaded.</span>"
 		CHECK_TICK
 	if(tank)
-		out += "<span class='notice'>[icon2html(tank, user)] It has \the [tank] mounted onto it.</span>"
+		out += "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>"
 	to_chat(user, out.Join("<br>"))
 
 /obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params)

code/game/objects/items/powerfist.dm

@@ -26,7 +26,7 @@
 		to_chat(user, "<span class='notice'>You'll need to get closer to see any more.</span>")
 		return
 	if(tank)
-		to_chat(user, "<span class='notice'>[icon2html(tank, user)] It has \the [tank] mounted onto it.</span>")
+		to_chat(user, "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>")
 
 
 /obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params)

code/game/objects/items/storage/storage.dm

@@ -88,7 +88,7 @@
 	var/list/things = src_object.contents.Copy()
 	var/datum/progressbar/progress = new(user, things.len, src)
 	while (do_after(user, 10, TRUE, src, FALSE, CALLBACK(src, .proc/handle_mass_item_insertion, things, src_object, user, progress)))
-		sleep(1)
+		stoplag(1)
 	qdel(progress)
 	orient2hud(user)
 	src_object.orient2hud(user)
@@ -489,7 +489,7 @@
 	var/list/things = contents.Copy()
 	var/datum/progressbar/progress = new(usr, things.len, T)
 	while (do_after(usr, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
-		sleep(1)
+		stoplag(1)
 	qdel(progress)
 
 /obj/item/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress)

code/game/objects/items/toys.dm

@@ -840,7 +840,7 @@
 	if(ishuman(user))
 		var/mob/living/carbon/human/cardUser = user
 		if(cardUser.is_holding(src))
-			cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "<span class='notice'>The card reads: [cardname]</span>")
+			cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "<span class='notice'>The card reads: [cardname].</span>")
 		else
 			to_chat(cardUser, "<span class='warning'>You need to have the card in your hand to check it!</span>")
 

code/game/objects/items/weaponry.dm

@@ -586,6 +586,31 @@
 	flags_1 = DROPDEL_1 | ABSTRACT_1
 	attack_verb = list("bopped")
 
+/obj/item/slapper
+	name = "slapper"
+	desc = "This is how real men fight."
+	icon_state = "latexballon"
+	force = 1
+	throwforce = 0
+	flags_1 = DROPDEL_1 | ABSTRACT_1
+	attack_verb = list("slapped")
+	hitsound = 'sound/effects/snap.ogg'
+
+/obj/item/slapper/attack(mob/M, mob/living/carbon/human/user)
+	if(ishuman(M))
+		var/mob/living/carbon/human/L = M
+		L.endTailWag()
+	if(user.a_intent != INTENT_HARM)
+		var/aim_for_face = ((user.zone_selected == "mouth") || (user.zone_selected == "eyes") || (user.zone_selected == "head"))
+		user.do_attack_animation(M)
+		playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1)
+		user.visible_message("<span class='danger'>[user] slaps [M] in the [(aim_for_face)?"face":user.zone_selected]!</span>",
+ 		"<span class='notice'>You slap [M] in the [(aim_for_face)?"face":user.zone_selected]! </span>",\
+ 		"You hear a slap.")
+		return
+	else
+		..()
+
 /obj/item/proc/can_trigger_gun(mob/living/user)
 	if(!user.can_use_guns(src))
 		return FALSE

code/game/objects/structures/barsigns.dm

@@ -120,7 +120,7 @@
 		return
 	emagged = TRUE
 	to_chat(user, "<span class='notice'>You emag the barsign. Takeover in progress...</span>")
-	sleep(100) //10 seconds
+	sleep(10 SECONDS)
 	set_sign(new /datum/barsign/hiddensigns/syndibarsign)
 	req_access = list(ACCESS_SYNDICATE)
 

code/game/objects/structures/beds_chairs/bed.dm

@@ -144,7 +144,7 @@
 
 /obj/item/roller/robo/examine(mob/user)
 	..()
-	to_chat(user, "The dock is [loaded ? "loaded" : "empty"]")
+	to_chat(user, "The dock is [loaded ? "loaded" : "empty"].")
 
 /obj/item/roller/robo/deploy_roller(mob/user, atom/location)
 	if(loaded)

code/game/objects/structures/crates_lockers/closets.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/closet.dmi'
 	icon_state = "generic"
 	density = TRUE
+	layer = BELOW_OBJ_LAYER
 	var/icon_door = null
 	var/icon_door_override = FALSE //override to have open overlay use icon different to its base's
 	var/secure = FALSE //secure locker or not, also used if overriding a non-secure locker with a secure door overlay to add fancy lights
@@ -53,6 +54,7 @@
 /obj/structure/closet/update_icon()
 	cut_overlays()
 	if(!opened)
+		layer = OBJ_LAYER
 		if(icon_door)
 			add_overlay("[icon_door]_door")
 		else
@@ -69,6 +71,7 @@
 				add_overlay("off")
 
 	else
+		layer = BELOW_OBJ_LAYER
 		if(icon_door_override)
 			add_overlay("[icon_door]_open")
 		else

code/game/turfs/turf.dm

@@ -330,7 +330,7 @@
 	var/list/things = src_object.contents.Copy()
 	var/datum/progressbar/progress = new(user, things.len, src)
 	while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, /obj/item/storage.proc/mass_remove_from_storage, src, things, progress)))
-		sleep(1)
+		stoplag(1)
 	qdel(progress)
 
 	return TRUE

code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm

@@ -142,9 +142,6 @@
 /proc/_sin(X)
 	return sin(X)
 
-/proc/_step(Ref, Dir, Speed = 0)
-	return step(Ref, Dir, Speed)
-
 /proc/_list_add(list/L, ...)
 	if (args.len < 2)
 		return
@@ -179,4 +176,34 @@
 /proc/_list_swap(list/L, Index1, Index2)
 	L.Swap(Index1, Index2)
 
+/proc/_walk(ref, dir, lag)
+	walk(ref, dir, lag)
+
+/proc/_walk_towards(ref, trg, lag)
+	walk_towards(ref, trg, lag)
+
+/proc/_walk_to(ref, trg, min, lag)
+	walk_to(ref, trg, min, lag)
+
+/proc/_walk_away(ref, trg, max, lag)
+	walk_away(ref, trg, max, lag)
+
+/proc/_walk_rand(ref, lag)
+	walk_rand(ref, lag)
+
+/proc/_step(ref, dir)
+	step(ref, dir)
+
+/proc/_step_rand(ref)
+	step_rand(ref)
+
+/proc/_step_to(ref, trg, min)
+	step_to(ref, trg, min)
+
+/proc/_step_towards(ref, trg)
+	step_towards(ref, trg)
+
+/proc/_step_away(ref, trg, max)
+	step_away(ref, trg, max)
+
 

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -20,7 +20,7 @@
 	var/sleep_factor = 750
 	var/unconscious_factor = 1000
 	var/heat_capacity = 20000
-	var/conduction_coefficient = 0.30
+	var/conduction_coefficient = 0.3
 
 	var/obj/item/reagent_containers/glass/beaker = null
 	var/reagent_transfer = 0
@@ -29,7 +29,7 @@
 	var/radio_key = /obj/item/device/encryptionkey/headset_med
 	var/radio_channel = "Medical"
 
-	var/running_bob_anim = FALSE
+	var/running_anim = FALSE
 
 	var/escape_in_progress = FALSE
 	var/message_cooldown
@@ -83,46 +83,51 @@
 /obj/machinery/atmospherics/components/unary/cryo_cell/update_icon()
 	cut_overlays()
 
+	if(panel_open)
+		add_overlay("pod-panel")
+
 	if(state_open)
 		icon_state = "pod-open"
-	else if(occupant)
+		return
+
+	if(occupant)
 		var/image/occupant_overlay
 
-		if(ismonkey(occupant)) // Monkey
-			occupant_overlay = mutable_appearance(CRYOMOBS, "monkey")
-
-		else if(isalienadult(occupant))
-
-			if(isalienroyal(occupant)) // Queen and prae
-				occupant_overlay = image(CRYOMOBS, "alienq")
-
-			else if(isalienhunter(occupant)) // Hunter
-				occupant_overlay = image(CRYOMOBS, "alienh")
-
-			else if(isaliensentinel(occupant)) // Sentinel
-				occupant_overlay = image(CRYOMOBS, "aliens")
-
-			else // Drone (or any other alien that isn't any of the above)
-				occupant_overlay = image(CRYOMOBS, "aliend")
-
-		else if(ishuman(occupant) || islarva(occupant) || (isanimal(occupant) && !ismegafauna(occupant))) // Mobs that are smaller than cryotube
+		if(ishuman(occupant) || islarva(occupant) || (isanimal(occupant) && !ismegafauna(occupant))) // Mobs that are smaller than cryotube
 			occupant_overlay = image(occupant.icon, occupant.icon_state)
 			occupant_overlay.copy_overlays(occupant)
 
-		else // Anything else
+		else if(ismonkey(occupant)) // Monkey
+			occupant_overlay = image(CRYOMOBS, "monkey")
+			occupant_overlay.copy_overlays(occupant)
+
+		else if(!isalienadult(occupant))
 			occupant_overlay = image(CRYOMOBS, "generic")
 
+		else if(isalienroyal(occupant)) // Queen and prae
+			occupant_overlay = image(CRYOMOBS, "alienq")
+
+		else if(isalienhunter(occupant)) // Hunter
+			occupant_overlay = image(CRYOMOBS, "alienh")
+
+		else if(isaliensentinel(occupant)) // Sentinel
+			occupant_overlay = image(CRYOMOBS, "aliens")
+
+		else // Drone or other
+			occupant_overlay = image(CRYOMOBS, "aliend")
+
 		occupant_overlay.dir = SOUTH
 		occupant_overlay.pixel_y = 22
 
-		if(on && !running_bob_anim && is_operational())
+		if(on && !running_anim && is_operational())
 			icon_state = "pod-on"
-			running_bob_anim = TRUE
-			run_bob_anim(TRUE, occupant_overlay)
+			running_anim = TRUE
+			run_anim(TRUE, occupant_overlay)
 		else
 			icon_state = "pod-off"
 			add_overlay(occupant_overlay)
 			add_overlay("cover-off")
+
 	else if(on && is_operational())
 		icon_state = "pod-on"
 		add_overlay("cover-on")
@@ -130,12 +135,9 @@
 		icon_state = "pod-off"
 		add_overlay("cover-off")
 
-	if(panel_open)
-		add_overlay("pod-panel")
-
-/obj/machinery/atmospherics/components/unary/cryo_cell/proc/run_bob_anim(anim_up, image/occupant_overlay)
+/obj/machinery/atmospherics/components/unary/cryo_cell/proc/run_anim(anim_up, image/occupant_overlay)
 	if(!on || !occupant || !is_operational())
-		running_bob_anim = FALSE
+		running_anim = FALSE
 		return
 	cut_overlays()
 	if(occupant_overlay.pixel_y != 23) // Same effect as occupant_overlay.pixel_y == 22 || occupant_overlay.pixel_y == 24
@@ -146,7 +148,7 @@
 		occupant_overlay.pixel_y--
 	add_overlay(occupant_overlay)
 	add_overlay("cover-on")
-	addtimer(CALLBACK(src, .proc/run_bob_anim, anim_up, occupant_overlay), 7, TIMER_UNIQUE)
+	addtimer(CALLBACK(src, .proc/run_anim, anim_up, occupant_overlay), 7, TIMER_UNIQUE)
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/process()
 	..()
@@ -157,60 +159,65 @@
 		on = FALSE
 		update_icon()
 		return
-	var/datum/gas_mixture/air1 = AIR1
-	var/turf/T = get_turf(src)
-	if(occupant)
-		var/mob/living/mob_occupant = occupant
-		if(mob_occupant.health >= mob_occupant.getMaxHealth()) // Don't bother with fully healed people.
-			on = FALSE
-			update_icon()
-			playsound(T, 'sound/machines/cryo_warning.ogg', volume) // Bug the doctors.
-			radio.talk_into(src, "Patient fully restored", radio_channel, get_spans(), get_default_language())
-			if(autoeject) // Eject if configured.
-				radio.talk_into(src, "Auto ejecting patient now", radio_channel, get_spans(), get_default_language())
-				open_machine()
-			return
-		else if(mob_occupant.stat == DEAD) // We don't bother with dead people.
-			return
-			if(autoeject) // Eject if configured.
-				open_machine()
-			return
-		if(air1.gases.len)
-			if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic.
-				mob_occupant.Sleeping((mob_occupant.bodytemperature / sleep_factor) * 2000)
-				mob_occupant.Unconscious((mob_occupant.bodytemperature / unconscious_factor) * 2000)
+	if(!occupant)
+		return
+
+	var/mob/living/mob_occupant = occupant
+
+	if(mob_occupant.stat == DEAD) // We don't bother with dead people.
+		return
+
+	if(mob_occupant.health >= mob_occupant.getMaxHealth()) // Don't bother with fully healed people.
+		on = FALSE
+		update_icon()
+		playsound(src, 'sound/machines/cryo_warning.ogg', volume) // Bug the doctors.
+		radio.talk_into(src, "Patient fully restored", radio_channel, get_spans(), get_default_language())
+		if(autoeject) // Eject if configured.
+			radio.talk_into(src, "Auto ejecting patient now", radio_channel, get_spans(), get_default_language())
+			open_machine()
+		return
+
+	var/datum/gas_mixture/air1 = AIR1
+
+	if(air1.gases.len)
+		if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic.
+			mob_occupant.Sleeping((mob_occupant.bodytemperature / sleep_factor) * 2000)
+			mob_occupant.Unconscious((mob_occupant.bodytemperature / unconscious_factor) * 2000)
+		if(beaker)
+			if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
+				beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic.
+				beaker.reagents.reaction(occupant, VAPOR)
+				air1.gases["o2"][MOLES] -= 2 / efficiency // Lets use gas for this.
+			if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker).
+				reagent_transfer = 0
 
-			if(beaker)
-				if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
-					beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic.
-					beaker.reagents.reaction(occupant, VAPOR)
-					air1.gases["o2"][MOLES] -= 2 / efficiency // Lets use gas for this.
-				if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker).
-					reagent_transfer = 0
 	return 1
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos()
 	..()
+
 	if(!on)
 		return
+
 	var/datum/gas_mixture/air1 = AIR1
+
 	if(!NODE1 || !AIR1 || !air1.gases.len || air1.gases["o2"][MOLES] < 5) // Turn off if the machine won't work.
 		on = FALSE
 		update_icon()
 		return
+
 	if(occupant)
 		var/mob/living/mob_occupant = occupant
 		var/cold_protection = 0
-		var/mob/living/carbon/human/H = occupant
-		if(istype(H))
+		var/temperature_delta = air1.temperature - mob_occupant.bodytemperature // The only semi-realistic thing here: share temperature between the cell and the occupant.
+
+		if(ishuman(occupant))
+			var/mob/living/carbon/human/H = occupant
 			cold_protection = H.get_cold_protection(air1.temperature)
 
-		var/temperature_delta = air1.temperature - mob_occupant.bodytemperature // The only semi-realistic thing here: share temperature between the cell and the occupant.
 		if(abs(temperature_delta) > 1)
 			var/air_heat_capacity = air1.heat_capacity()
-			var/heat = ((1 - cold_protection) / 10 + conduction_coefficient) \
-						* temperature_delta * \
-						(air_heat_capacity * heat_capacity / (air_heat_capacity + heat_capacity))
+			var/heat = ((1 - cold_protection) * 0.1 + conduction_coefficient) * temperature_delta * (1 / air_heat_capacity + 1 / heat_capacity)
 			air1.temperature = max(air1.temperature - heat / air_heat_capacity, TCMB)
 			mob_occupant.bodytemperature = max(mob_occupant.bodytemperature + heat / heat_capacity, TCMB)
 
@@ -248,7 +255,7 @@
 	user.visible_message("<span class='notice'>You see [user] kicking against the glass of [src]!</span>", \
 		"<span class='notice'>You struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a thump from [src].</span>")
-	if(do_after(user,(breakout_time), target = src))
+	if(do_after(user, breakout_time, target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src )
 			return
 		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \
@@ -284,16 +291,10 @@
 		var/reagentlist = pretty_string_from_reagent_list(I.reagents.reagent_list)
 		log_game("[key_name(user)] added an [I] to cyro containing [reagentlist]")
 		return
-	if(!on && !occupant && !state_open)
-		if(default_deconstruction_screwdriver(user, "pod-off", "pod-off", I))
-			return
-		if(exchange_parts(user, I))
-			return
-	if(default_change_direction_wrench(user, I))
-		return
-	if(default_pry_open(I))
-		return
-	if(default_deconstruction_crowbar(I))
+	if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-o", "pod-off", I) || exchange_parts(user, I)) \
+		|| default_change_direction_wrench(user, I) \
+		|| default_pry_open(I) \
+		|| default_deconstruction_crowbar(I))
 		return
 	return ..()
 
@@ -384,16 +385,16 @@
 	update_icon()
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/update_remote_sight(mob/living/user)
-	return //we don't see the pipe network while inside cryo.
+	return // we don't see the pipe network while inside cryo.
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user)
 	user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/can_crawl_through()
-	return //can't ventcrawl in or out of cryo.
+	return // can't ventcrawl in or out of cryo.
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/can_see_pipes()
-	return 0 //you can't see the pipe network when inside a cryo cell.
+	return 0 // you can't see the pipe network when inside a cryo cell.
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/return_temperature()
 	var/datum/gas_mixture/G = AIR1