- Added broken icon state for virology console.

- Raised the chance to cure brainrot and GBS, lowered the chance to teleport for wizarditis.
- Made Pandemic console buildable (and unbuildable) and placed the circuitboard in technical storage.
- Replacement lights crate can be ordered in QM.
- Added space cleaner and hand labeler to Virology.

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

code/WorkInProgress/Chemistry-Machinery.dm

@@ -234,7 +234,7 @@
 
 
 
-/obj/machinery/pandemic/
+/obj/machinery/computer/pandemic
 	name = "PanD.E.M.I.C 2200"
 	density = 1
 	anchored = 1
@@ -244,49 +244,27 @@
 	var/wait = null
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
 
-	ex_act(severity)
-		switch(severity)
-			if(1.0)
-				del(src)
-				return
-			if(2.0)
-				if (prob(50))
-					del(src)
-					return
 
-	blob_act()
-		if (prob(50))
-			del(src)
+	set_broken()
+		icon_state = (src.beaker?"mixer1_b":"mixer0_b")
+		stat |= BROKEN
 
-	meteorhit()
-		del(src)
-		return
 
 	power_change()
-		if(powered())
+
+		if(stat & BROKEN)
+			icon_state = (src.beaker?"mixer1_b":"mixer0_b")
+
+		else if(powered())
 			icon_state = (src.beaker?"mixer1":"mixer0")
 			stat &= ~NOPOWER
+
 		else
 			spawn(rand(0, 15))
 				src.icon_state = (src.beaker?"mixer1_nopower":"mixer0_nopower")
 				stat |= NOPOWER
 
 
-	attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob)
-		if(!istype(B, /obj/item/weapon/reagent_containers/glass))
-			return
-
-		if(src.beaker)
-			user << "A beaker is already loaded into the machine."
-			return
-
-		src.beaker =  B
-		user.drop_item()
-		B.loc = src
-		user << "You add the beaker to the machine!"
-		src.updateUsrDialog()
-		icon_state = "mixer1"
-
 	Topic(href, href_list)
 		if(stat & (NOPOWER|BROKEN)) return
 		if(usr.stat || usr.restrained()) return
@@ -409,4 +387,48 @@
 
 		user << browse("<TITLE>PanD.E.M.I.C 2200</TITLE><BR>[dat]", "window=pandemic;size=575x400")
 		onclose(user, "pandemic")
+		return
+
+	attackby(var/obj/I as obj, var/mob/user as mob)
+		if(istype(I, /obj/item/weapon/screwdriver))
+			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			if(do_after(user, 20))
+				if (src.stat & BROKEN)
+					user << "\blue The broken glass falls out."
+					var/obj/computerframe/A = new /obj/computerframe(src.loc)
+					new /obj/item/weapon/shard(src.loc)
+					var/obj/item/weapon/circuitboard/pandemic/M = new /obj/item/weapon/circuitboard/pandemic(A)
+					for (var/obj/C in src)
+						C.loc = src.loc
+					A.circuit = M
+					A.state = 3
+					A.icon_state = "3"
+					A.anchored = 1
+					del(src)
+				else
+					user << "\blue You disconnect the monitor."
+					var/obj/computerframe/A = new /obj/computerframe( src.loc )
+					var/obj/item/weapon/circuitboard/pandemic/M = new /obj/item/weapon/circuitboard/pandemic(A)
+					for (var/obj/C in src)
+						C.loc = src.loc
+					A.circuit = M
+					A.state = 4
+					A.icon_state = "4"
+					A.anchored = 1
+					del(src)
+		else if(istype(I, /obj/item/weapon/reagent_containers/glass))
+			if(stat & (NOPOWER|BROKEN)) return
+			if(src.beaker)
+				user << "A beaker is already loaded into the machine."
+				return
+
+			src.beaker =  I
+			user.drop_item()
+			I.loc = src
+			user << "You add the beaker to the machine!"
+			src.updateUsrDialog()
+			icon_state = "mixer1"
+
+		else
+			..()
 		return

code/WorkInProgress/Chemistry-Tools.dm

@@ -366,7 +366,7 @@
 	/obj/machinery/atmospherics/unary/cryo_cell,
 	/obj/item/weapon/chem_grenade,
 	/obj/machinery/bot/medbot,
-	/obj/machinery/pandemic,
+	/obj/machinery/computer/pandemic,
 	/obj/item/weapon/secstorage/ssafe)
 
 	examine()

code/datums/diseases/brainrot.dm

@@ -30,9 +30,8 @@
 				affected_mob.emote("stare")
 			if(prob(2))
 				affected_mob.emote("drool")
-			if(prob(10))
-				if(affected_mob.brainloss<=98) //shouldn't retard you to death now
-					affected_mob.brainloss += 2
+			if(prob(10) && affected_mob.brainloss<=98)//shouldn't retard you to death now
+				affected_mob.brainloss += 2
 				affected_mob.updatehealth()
 				if(prob(2))
 					affected_mob << "\red Your try to remember something important...but can't."
@@ -51,7 +50,7 @@
 				affected_mob.updatehealth()
 				if(prob(2))
 					affected_mob << "\red Your head hurts." */
-			if(prob(15))
+			if(prob(15) && affected_mob.brainloss<=98) //shouldn't retard you to death now
 				affected_mob.brainloss +=3
 				affected_mob.updatehealth()
 				if(prob(2))

code/datums/diseases/gbs.dm

@@ -5,6 +5,7 @@
 	spread_type = CONTACT_GENERAL
 	cure = "Synaptizine & Sulfur"
 	cure_id = list("synaptizine","sulfur")
+	cure_chance = 15//higher chance to cure, since two reagents are required
 	agent = "Gravitokinetic Bipotential SADS+"
 	affected_species = list("Human")
 	curable = 0

code/datums/diseases/wizarditis.dm

@@ -45,7 +45,7 @@ STI KALY - blind
 				return
 			if(prob(2))
 				affected_mob << "\red You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")]."
-			if(prob(5))
+			if(prob(2))
 				teleport()
 
 	return
@@ -129,4 +129,4 @@ STI KALY - blind
 	affected_mob.loc = pick(L)
 	smoke.start()
 //Apparently it created a lagspike every time it was called -- Urist
-	return
+	return

code/game/machinery/computer/buildandrepair.dm

@@ -33,6 +33,9 @@
 /obj/item/weapon/circuitboard/med_data
 	name = "Circuit board (Medical Records)"
 	computertype = "/obj/machinery/computer/med_data"
+/obj/item/weapon/circuitboard/pandemic
+	name = "Circuit board (PanD.E.M.I.C. 2200)"
+	computertype = "/obj/machinery/computer/pandemic"
 /obj/item/weapon/circuitboard/scan_consolenew
 	name = "Circuit board (DNA Machine)"
 	computertype = "/obj/machinery/scan_consolenew"

code/game/supplyshuttle.dm

@@ -176,6 +176,24 @@ var/supply_shuttle_points = 50
 	containertype = "/obj/crate"
 	containername = "Janitorial supplies"
 
+/obj/item/weapon/storage/lightbox/tubes
+
+/datum/supply_packs/lightbulbs
+	name = "Replacement lights"
+	contains = list("/obj/item/weapon/storage/lightbox/tubes",
+					"/obj/item/weapon/storage/lightbox/tubes",
+					"/obj/item/weapon/storage/lightbox/tubes",
+					"/obj/item/weapon/storage/lightbox/tubes",
+					"/obj/item/weapon/storage/lightbox",
+					"/obj/item/weapon/storage/lightbox",
+					"/obj/item/weapon/storage/lightbox",
+					"/obj/item/weapon/storage/lightbox")
+	cost = 10
+	containertype = "/obj/crate"
+	containername = "Replacement lights"
+
+
+
 /datum/supply_packs/plasma
 	name = "Plasma assembly crate"
 	contains = list("/obj/item/weapon/tank/plasma",