Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into virus-racism

Conflicts:
	code/modules/virus2/helpers.dm

code/modules/virus2/analyser.dm

@@ -28,7 +28,8 @@
 /obj/machinery/disease2/diseaseanalyser/process()
 	if(stat & (NOPOWER|BROKEN))
 		return
-	use_power(500)
+
+	//use_power(500)
 
 	if(scanning)
 		scanning -= 1
@@ -59,4 +60,4 @@
 				dish = null
 				src.state("\The [src.name] buzzes")
 				pause = 0
-	return
+	return

code/modules/virus2/centrifuge.dm

@@ -72,7 +72,7 @@
 
 	if(stat & (NOPOWER|BROKEN))
 		return
-	use_power(500)
+	//use_power(500)
 
 	if(curing)
 		curing -= 1
@@ -151,4 +151,4 @@
 	var/obj/item/weapon/virusdish/dish = new/obj/item/weapon/virusdish(src.loc)
 	dish.virus2 = virus2
 
-	state("\The [src.name] pings", "blue")
+	state("\The [src.name] pings", "blue")

code/modules/virus2/disease2.dm

@@ -100,6 +100,7 @@
 	for(var/datum/disease2/effectholder/e in effects)
 		e.effect.deactivate(mob)
 	mob.virus2.Remove("[uniqueID]")
+	mob.hud_updateflag |= 1 << STATUS_HUD
 
 /datum/disease2/disease/proc/minormutate()
 	//uniqueID = rand(0,10000)
@@ -202,6 +203,7 @@ proc/virus2_lesser_infection()
 	for(var/mob/living/carbon/human/G in player_list)
 		if(G.client && G.stat != DEAD)
 			candidates += G
+
 	if(!candidates.len)	return
 
 	candidates = shuffle(candidates)

code/modules/virus2/diseasesplicer.dm

@@ -7,7 +7,7 @@
 	var/analysed = 0
 	var/obj/item/weapon/virusdish/dish = null
 	var/burning = 0
-
+	
 	var/splicing = 0
 	var/scanning = 0
 
@@ -90,7 +90,7 @@
 /obj/machinery/computer/diseasesplicer/process()
 	if(stat & (NOPOWER|BROKEN))
 		return
-	use_power(500)
+	//use_power(500)
 
 	if(scanning)
 		scanning -= 1

code/modules/virus2/helpers.dm

@@ -93,6 +93,7 @@ proc/airborne_can_reach(turf/source, turf/target)
 		D.minormutate()
 //		log_debug("Adding virus")
 		M.virus2["[D.uniqueID]"] = D
+		M.hud_updateflag |= 1 << STATUS_HUD
 
 //Infects mob M with random lesser disease, if he doesn't have one
 /proc/infect_mob_random_lesser(var/mob/living/carbon/M)
@@ -100,12 +101,14 @@ proc/airborne_can_reach(turf/source, turf/target)
 	D.makerandom()
 	D.infectionchance = 1
 	infect_virus2(M,D,1)
+	M.hud_updateflag |= 1 << STATUS_HUD
 
 //Infects mob M with random greated disease, if he doesn't have one
 /proc/infect_mob_random_greater(var/mob/living/carbon/M)
 	var/datum/disease2/disease/D = new /datum/disease2/disease
 	D.makerandom(1)
 	infect_virus2(M,D,1)
+	M.hud_updateflag |= 1 << STATUS_HUD
 
 /mob/living/carbon/proc/spread_disease_to(var/mob/living/carbon/victim, var/vector = "Airborne")
 	if (src == victim)
@@ -147,4 +150,4 @@ proc/airborne_can_reach(turf/source, turf/target)
 			for (var/ID in victim.virus2)
 				var/datum/disease2/disease/V = victim.virus2[ID]
 				if(V && V.spreadtype != vector) continue
-				infect_virus2(src,V)
+				infect_virus2(src,V)