[MIRROR] Better Viro (#9421)

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

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

@@ -19,7 +19,7 @@ var/global/list/image/splatter_cache=list()
 	blood_DNA = list()
 	var/basecolor="#A10808" // Color when wet.
 	var/synthblood = 0
-	var/list/datum/disease2/disease/virus2 = list()
+	var/list/datum/disease/viruses = list()
 	var/amount = 5
 	generic_filth = TRUE
 	persistent = FALSE
@@ -242,7 +242,7 @@ var/global/list/image/splatter_cache=list()
 	icon_state = "mucus"
 	random_icon_states = list("mucus")
 
-	var/list/datum/disease2/disease/virus2 = list()
+	var/list/datum/disease/viruses = list()
 	var/dry = 0 // Keeps the lag down
 	var/sampled = FALSE
 
@@ -253,11 +253,10 @@ var/global/list/image/splatter_cache=list()
 //This version should be used for admin spawns and pre-mapped virus vectors (e.g. in PoIs), this version does not dry
 /obj/effect/decal/cleanable/mucus/mapped/Initialize()
 	. = ..()
-	virus2 |= new /datum/disease2/disease
-	virus2[1].makerandom()
+	viruses |= new /datum/disease/advance
 
 /obj/effect/decal/cleanable/mucus/mapped/Destroy()
-	virus2.Cut()
+	viruses.Cut()
 	return ..()
 
 #undef DRYING_TIME

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

@@ -113,7 +113,7 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "vomit_1"
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
-	var/list/datum/disease2/disease/virus2 = list()
+	var/list/datum/disease/viruses = list()
 
 /obj/effect/decal/cleanable/tomato_smudge
 	name = "tomato smudge"

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

@@ -101,9 +101,13 @@
 	if(M.getCloneLoss())
 		dat += span_bold("Genetic Damage") + " - Utilize cryogenic pod with appropriate chemicals (i.e. Cryoxadone) and below 70 K, or give Rezadone.<br>"
 	if(bone)
-		dat += span_bold("Bone Fracture") + " - Splint the fractured limb. Commence a bone repair operation or administer Osteodaxon after treating the physical trauma.<br>"
-	if(M.virus2.len)
-		dat += span_bold("Viral Infection") + " - Inform a Virologist or the Chief Medical Officer and administer antiviral chemicals such as Corophizine and Spaceacilin. Limit exposure to other personnel.<br>"
+		dat += span_bold("Bone fracture") + " - Splint damaged area. Treat with bone repair surgery or Osteodaxon after treating brute damage.<br>"
+	if(M.viruses.len)
+		for(var/datum/disease/D in M.GetViruses())
+			if(D.visibility_flags & HIDDEN_SCANNER)
+				continue
+			else
+				dat += span_bold("Viral Infection") + " - Inform a Virologist or the Chief Medical Officer and administer antiviral chemicals such as Spaceacilin. Limit exposure to other personnel.<br>"
 	if(robotparts)
 		dat += span_bold("Robotic Body Parts") + " - Inform the Robotics department."
 

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

@@ -248,14 +248,14 @@
 				else
 					dat += span_warning("Unknown substance[(unknown > 1)?"s":""] found in subject's dermis.")
 					dat += "<br>"
-		if(C.virus2.len)
-			for (var/ID in C.virus2)
-				if (ID in virusDB)
-					var/datum/data/record/V = virusDB[ID]
-					dat += span_warning("Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]")
+		if(C.resistances.len)
+			for (var/datum/disease/virus in C.GetViruses())
+				if(virus.visibility_flags & HIDDEN_SCANNER || virus.visibility_flags & HIDDEN_PANDEMIC)
+					continue
+				if(virus.discovered)
+					dat += span_warning("Warning: [virus.name] detected in subject's blood.")
 					dat += "<br>"
-				else
-					dat += span_warning("Warning: Unknown pathogen detected in subject's blood.")
+					dat += span_warning("Severity: [virus.severity]")
 					dat += "<br>"
 	if (M.getCloneLoss())
 		dat += span_warning("Subject appears to have been imperfectly cloned.")

code/game/objects/items/weapons/circuitboards/computer/computer.dm

@@ -154,14 +154,6 @@
 	build_path = /obj/machinery/computer/operating
 	origin_tech = list(TECH_DATA = 2, TECH_BIO = 2)
 
-/obj/item/circuitboard/curefab
-	name = T_BOARD("cure fabricator")
-	build_path = /obj/machinery/computer/curer
-
-/obj/item/circuitboard/splicer
-	name = T_BOARD("disease splicer")
-	build_path = /obj/machinery/computer/diseasesplicer
-
 /obj/item/circuitboard/mining_shuttle
 	name = T_BOARD("mining shuttle console")
 	build_path = /obj/machinery/computer/shuttle_control/mining
@@ -226,4 +218,4 @@
 /obj/item/circuitboard/stockexchange
 	name = T_BOARD("stock exchange console")
 	build_path = /obj/machinery/computer/stockexchange
-	origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 1)
+	origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 1)

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

@@ -453,7 +453,7 @@
 	max_storage_space = ITEMSIZE_COST_SMALL * 12
 	max_w_class = ITEMSIZE_NORMAL
 	w_class = ITEMSIZE_SMALL
-	can_hold = list(/obj/item/reagent_containers/glass/beaker/vial/,/obj/item/virusdish/)
+	can_hold = list(/obj/item/reagent_containers/glass/beaker/vial/)
 
 // -----------------------------
 //           Food Bag

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

@@ -250,7 +250,6 @@
 		/obj/item/cell/device,
 		/obj/item/extinguisher/mini,
 		/obj/item/ammo_casing/macrobattery, // CHOMPedit: Macrobatteries for the Curabitur can fit into medbelts.
-		/obj/item/antibody_scanner, // VOREstation edit start
 		/obj/item/sleevemate,
 		/obj/item/mass_spectrometer,
 		/obj/item/surgical,

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

@@ -300,7 +300,7 @@
 
 /obj/item/storage/box/syndie_kit/viral
 	starts_with = list(
-		/obj/item/virusdish/random = 3
+		// /obj/item/virusdish/random = 3
 		)
 
 /obj/item/storage/secure/briefcase/rifle