Fixes and small modifications mostly. Nothing too important.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1852 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Machinery.dm

@@ -422,10 +422,12 @@
 					var/list/vir = Blood.data["viruses"]
 					if(vir.len)
 						for(var/datum/disease/D in Blood.data["viruses"])
+							if(!D.hidden[PANDEMIC])
 
-							dat += "<b>Disease Agent:</b> [D?"[D.agent] - <A href='?src=\ref[src];create_virus_culture=[D.type]'>Create virus culture bottle</A>":"none"]<BR>"
+								dat += "<b>Disease Agent:</b> [D?"[D.agent] - <A href='?src=\ref[src];create_virus_culture=[D.type]'>Create virus culture bottle</A>":"none"]<BR>"
-							dat += "<b>Common name:</b> [(D.name||"none")]<BR>"
+								dat += "<b>Common name:</b> [(D.name||"none")]<BR>"
-							dat += "<b>Possible cure:</b> [(D.cure||"none")]<BR><BR>"
+								dat += "<b>Description: </b> [(D.desc||"none")]<BR>"
+								dat += "<b>Possible cure:</b> [(D.cure||"none")]<BR><BR>"
 
 				dat += "<b>Contains antibodies to:</b> "
 				if(Blood.data["resistances"])

code/datums/disease.dm

@@ -6,6 +6,9 @@
 #define AIRBORNE 4
 #define BLOOD 5
 
+#define SCANNER 1
+#define PANDEMIC 2
+
 /*
 
 IMPORTANT NOTE: Please delete the diseases by using cure() proc or del() instruction.
@@ -38,6 +41,10 @@ to null does not delete the object itself. Thank you.
 	var/desc = null//description. Leave it null and this disease won't show in med records.
 	var/severity = null//severity descr
 	var/longevity = 250//time in "ticks" the virus stays in inanimate object (blood stains, corpses, etc). In syringes, bottles and beakers it stays infinitely.
+	var/list/hidden = list(0, 0)
+	// if hidden[1] is true, then virus is hidden from medical scanners
+	// if hidden[2] is true, then virus is hidden from PANDEMIC machine
+
 
 /datum/disease/proc/stage_act()
 	var/cure_present = has_cure()
@@ -274,7 +281,7 @@ to null does not delete the object itself. Thank you.
 /datum/disease/proc/spread(var/atom/source=null)
 	//world << "Disease [src] proc spread was called from holder [source]"
 
-	if(spread_type == SPECIAL)//does not spread
+	if(spread_type == SPECIAL || spread_type == NON_CONTAGIOUS)//does not spread
 		return
 
 	if(stage < contagious_period) //the disease is not contagious at this stage
@@ -318,15 +325,6 @@ to null does not delete the object itself. Thank you.
 			affected_mob = null
 	if(!affected_mob) //the virus is in inanimate obj
 //		world << "[src] longevity = [longevity]"
-		/*
-		if(holder)
-
-			// spreads the love. Why hasn't anyone coded this in yet?!?!?!?
-			for(var/mob/living/M in view(1, holder))
-				if(M.stat != 2)
-					if(prob(90))
-						M.contract_disease(src)
-		*/
 
 		if(prob(70))
 			if(--longevity<=0)

code/game/objects/devices/PDA/PDA.dm

@@ -691,7 +691,8 @@
 				user.show_message("\blue \t Key: Suffocation/Toxin/Burns/Brute", 1)
 				user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1)
 				for(var/datum/disease/D in C.viruses)
-					user.show_message(text("\red <b>Warning Virus Detected.</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
+					if(!D.hidden[SCANNER])
+						user.show_message(text("\red <b>Warning Virus Detected.</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
 
 			if(2)
 				if (!istype(C:dna, /datum/dna) || !isnull(C:gloves))

code/game/objects/devices/scanners.dm

@@ -174,7 +174,8 @@ MASS SPECTROMETER
 	if (M.cloneloss)
 		user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1)
 	for(var/datum/disease/D in M.viruses)
-		user.show_message(text("\red <b>Warning: Virus Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
+		if(!D.hidden[SCANNER])
+			user.show_message(text("\red <b>Warning: Virus Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
 	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
 		user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1)
 	if (M.brainloss >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)

code/game/objects/items/weapons/guns_new.dm

@@ -115,7 +115,7 @@ var/const/PROJECTILE_DART = 8
 				if(istype(src, /obj/item/projectile/freeze))
 					var/obj/item/projectile/freeze/F = src
 					F.Freeze(A)
-				if(istype(src, /obj/item/projectile/plasma))
+				else if(istype(src, /obj/item/projectile/plasma))
 					var/obj/item/projectile/plasma/P = src
 					P.Heat(A)
 				else
@@ -864,7 +864,7 @@ var/const/PROJECTILE_DART = 8
 			name = "plasma gun"
 			icon_state = "plasmagun"
 			fire_sound = 'pulse3.ogg'
-			desc = "A gun that fires super heated plasma at targets, thus increasing their overal body temparature and also harming them."
+			desc = "A gun that fires super heated plasma at targets, thus increasing their overall body temparature and also harming them."
 			var/temperature = T20C
 			var/current_temperature = T20C
 			charge_cost = 100

code/modules/mob/living/silicon/pai/hud.dm

@@ -36,7 +36,9 @@
 		for(var/mob/living/carbon/human/patient in view(T))
 
 			var/foundVirus = 0
-			for(var/datum/disease/D in patient.viruses) foundVirus = 1
+			for(var/datum/disease/D in patient.viruses)
+				if(!D.hidden[SCANNER])
+					foundVirus = 1
 
 			client.images += image(tempHud,patient,"hud[RoundHealth(patient.health)]")
 			if(patient.stat == 2)