.

code/__DEFINES/diseases.dm

@@ -34,3 +34,5 @@
 #define DISEASE_SEVERITY_DANGEROUS "Dangerous"
 /// Diseases that can quickly kill an unprepared victim (fungal tb, gbs)
 #define DISEASE_SEVERITY_BIOHAZARD "BIOHAZARD"
+
+#define DISEASE_HOLOSIGN_BLOCK 6

code/__DEFINES/role_preferences.dm

@@ -40,6 +40,7 @@
 #define ROLE_SPIDER "Spider"
 #define ROLE_WIZARD_MIDROUND "Wizard (Midround)"
 // monke midrounds
+#define ROLE_PLAGUERAT "Plague Rat"
 #define ROLE_CORTICAL_BORER "Cortical Borer"
 #define ROLE_DRIFTING_CONTRACTOR "Drifting Contractor"
 #define ROLE_FLORIDA_MAN "Florida Man"
@@ -153,6 +154,7 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_SPIDER = 0,
 	ROLE_WIZARD_MIDROUND = 14,
 //monkestation edit start
+	ROLE_PLAGUERAT = 0,
 	ROLE_CORTICAL_BORER = 0,  // Module ID: CORTICAL_BORERS
 	ROLE_DRIFTING_CONTRACTOR = 0,
 	ROLE_VAMPIRICACCIDENT = 0,

code/__DEFINES/~monkestation/virology.dm

@@ -47,3 +47,16 @@
 #define DISEASE_TRAUMA "trauma"
 #define DISEASE_DECLONING "decloning"
 #define DISEASE_ANXIETY "anxiety"
+
+#define DISEASE_DORMANT (1 << 3)
+#define DISEASE_COPYSTAGE (1<<4)
+#define DISEASE_ANALYZED (1<<5)
+
+#define COMSIG_CRACKER_PUZZLE_FAILURE "cracker_puzzle_failure"
+#define COMSIG_CRACKER_PUZZLE_SUCCESS "cracker_puzzle_success"
+
+#define COMSIG_SYMPTOM_ATTACH "symptom_attach"
+#define COMSIG_SYMPTOM_DETACH "symptom_detach"
+#define COMSIG_SYMPTOM_TRIGGER "symptom_trigger"
+
+#define COMSIG_CARBON_TAKE_BRUTE_DAMAGE "carbon_take_brute"

code/_globalvars/bitfields.dm

@@ -117,6 +117,9 @@ DEFINE_BITFIELD(disease_flags, list(
 	"CAN_CARRY" = CAN_CARRY,
 	"CAN_RESIST" = CAN_RESIST,
 	"CURABLE" = CURABLE,
+	"DORMANT" = DISEASE_DORMANT,
+	"STAGE_COPY" = DISEASE_COPYSTAGE,
+	"ANALYZED" = DISEASE_ANALYZED,
 ))
 
 DEFINE_BITFIELD(flags_1, list(

code/controllers/subsystem/processing/fastprocess.dm

@@ -12,4 +12,4 @@ PROCESSING_SUBSYSTEM_DEF(actualfastprocess)
 PROCESSING_SUBSYSTEM_DEF(pathogen_processing)
 	name = "Pathogen Cloud Processing"
 	wait = 1 SECONDS
-	stat_tag = "SP"
+	stat_tag = "PC"

code/datums/components/infective.dm

@@ -25,7 +25,6 @@
 	RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(try_infect_buckle))
 	RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(try_infect_collide))
 	RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(try_infect_impact_zone))
-	RegisterSignal(parent, COMSIG_ATOM_EXTRAPOLATOR_ACT, PROC_REF(extrapolation))
 	if(isitem(parent))
 		RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, PROC_REF(try_infect_attack_zone))
 		RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack))
@@ -133,11 +132,3 @@
 		if(length(contact) && !block)
 			for(var/datum/disease/advanced/V as anything in contact)
 				living.try_contact_infect(V, note="(Skin Contact - (Infective Component), coming from [src.parent])")
-
-/datum/component/infective/proc/extrapolation(datum/source, mob/user, obj/item/extrapolator/E, scan = TRUE)
-	SIGNAL_HANDLER
-
-	if(scan)
-		E.scan(source, diseases, user)
-	else
-		INVOKE_ASYNC(E, TYPE_PROC_REF(/obj/item/extrapolator, extrapolate), source, diseases, user)

code/datums/diseases/_disease.dm

@@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(inspectable_diseases, list())
 
 	//Other
 	var/list/viable_mobtypes = list() //typepaths of viable mobs
-	var/mob/living/carbon/affected_mob = null
+	var/mob/living/affected_mob = null
 	var/list/cures = list() //list of cures if the disease has the CURABLE flag, these are reagent ids
 	/// The probability of spreading through the air every second
 	var/infectivity = 41
@@ -186,18 +186,29 @@ GLOBAL_LIST_INIT(inspectable_diseases, list())
 		"subID",
 		"uniqueID",
 		"childID",
-		"symptoms",
 		"stageprob",
 		"antigen",
 		)
 
 	var/datum/disease/D = copy_type ? new copy_type() : new type()
+	if(disease_flags & DISEASE_COPYSTAGE)
+		D.stage = stage
+
 	for(var/V in copy_vars)
 		var/val = vars[V]
 		if(islist(val))
 			var/list/L = val
 			val = L.Copy()
 		D.vars[V] = val
+
+	var/list/new_symptoms = list()
+	for(var/datum/symptom/symptom as anything in symptoms)
+		var/datum/symptom/copied_symptom = symptom.Copy()
+		new_symptoms += copied_symptom
+		SEND_SIGNAL(copied_symptom, COMSIG_SYMPTOM_ATTACH, D)
+
+	D.symptoms = new_symptoms
+
 	return D
 
 /datum/disease/proc/after_add()