Added a new disease.

Removed GBS.
Fixed mime invisiwall.
Removed the red stripe on HoS's suit AGAIN.
Added metroid jam.

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

code/WorkInProgress/Chemistry-Reagents.dm

@@ -44,11 +44,11 @@ datum
 			on_mob_life(var/mob/M)
 				holder.remove_reagent(src.id, 0.4) //By default it slowly disappears.
 				return
-/*
+
 		metroid
-			name = "Metroid Jelly"
+			name = "Metroid Jam"
 			id = "metroid"
-			description = "A green liquid produced from one of the deadliest lifeforms in existence."
+			description = "A green semi-liquid produced from one of the deadliest lifeforms in existence."
 			reagent_state = LIQUID
 			on_mob_life(var/mob/M)
 				if(prob(10))
@@ -56,8 +56,8 @@ datum
 					M.toxloss+=20
 				else if(prob(40))
 					M.bruteloss-=5
-				..() //Code no work :< -- Urist
-*/
+				..()
+
 
 
 		blood
@@ -593,6 +593,18 @@ datum
 			description = "Pure iron is a metal."
 			reagent_state = SOLID
 
+			on_mob_life(var/mob/M)
+				if(!M) M = holder.my_atom
+				if((M.virus) && (prob(8) && (M.virus.name=="Magnitis")))
+					if(M.virus.spread == "Airborne")
+						M.virus.spread = "Remissive"
+					M.virus.stage--
+					if(M.virus.stage <= 0)
+						M.resistances += M.virus.type
+						M.virus = null
+				holder.remove_reagent(src.id, 0.2)
+				return
+
 		aluminium
 			name = "Aluminium"
 			id = "aluminium"
@@ -942,7 +954,7 @@ datum
 
 			on_mob_life(var/mob/M)
 				if(!M) M = holder.my_atom
-				if((M.virus) && (prob(8)))
+				if((M.virus) && (prob(8) && (M.virus.name!="Magnitis")))
 					if(M.virus.spread == "Airborne")
 						M.virus.spread = "Remissive"
 					M.virus.stage--

code/WorkInProgress/Chemistry-Tools.dm

@@ -1170,7 +1170,7 @@
 		var/list/data = list("virus"= F)
 		R.add_reagent("blood", 20, data)
 
-
+/*
 /obj/item/weapon/reagent_containers/glass/bottle/gbs
 	name = "GBS culture bottle"
 	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
@@ -1184,8 +1184,8 @@
 		R.my_atom = src
 		var/datum/disease/F = new /datum/disease/gbs
 		var/list/data = list("virus"= F)
-		R.add_reagent("blood", 20, data)
-
+		R.add_reagent("blood", 20, data) -- No.
+*/
 /obj/item/weapon/reagent_containers/glass/bottle/fake_gbs
 	name = "GBS culture bottle"
 	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
@@ -1217,6 +1217,21 @@
 		var/list/data = list("virus"= F)
 		R.add_reagent("blood", 20, data)
 
+/obj/item/weapon/reagent_containers/glass/bottle/magnitis
+	name = "GBS culture bottle"
+	desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
+	icon = 'chemical.dmi'
+	icon_state = "bottle3"
+	amount_per_transfer_from_this = 5
+
+	New()
+		var/datum/reagents/R = new/datum/reagents(20)
+		reagents = R
+		R.my_atom = src
+		var/datum/disease/F = new /datum/disease/magnitis
+		var/list/data = list("virus"= F)
+		R.add_reagent("blood", 20, data)
+
 
 /obj/item/weapon/reagent_containers/glass/beaker
 	name = "beaker"
@@ -2029,7 +2044,6 @@
 
 ///jar
 
-/*
 /obj/item/weapon/reagent_containers/food/drinks/jar
 	name = "empty jar"
 	desc = "A jar. You're not sure what it's supposed to hold."
@@ -2040,6 +2054,7 @@
 		var/datum/reagents/R = new/datum/reagents(50)
 		reagents = R
 		R.my_atom = src
+		R.add_reagent("metroid", 50)
 
 	on_reagent_change()
 		if (reagents.reagent_list.len > 0)
@@ -2056,5 +2071,4 @@
 			icon_state = "jar"
 			name = "empty jar"
 			desc = "A jar. You're not sure what it's supposed to hold."
-			return //Code no work :< -- Urist
-			*/
+			return

code/datums/diseases/magnitis.dm

@@ -0,0 +1,59 @@
+/datum/disease/magnitis
+	name = "Magnitis"
+	max_stages = 4
+	spread = "Airborne"
+	cure = "Iron"
+	agent = "Fukkos Miracos"
+	affected_species = list("Human")
+	curable = 0
+
+/datum/disease/magnitis/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(2))
+				affected_mob << "\red You feel a slight shock course through your body."
+			if(prob(2))
+				for(var/obj/M in orange(2,affected_mob))
+					if(M.flags & CONDUCT)
+						if(M.x > affected_mob.x)
+							M.x--
+						else if(M.x < affected_mob.x)
+							M.x++
+						if(M.y > affected_mob.y)
+							M.y--
+						else if(M.y < affected_mob.y)
+							M.y++
+		if(3)
+			if(prob(2))
+				affected_mob << "\red You feel a strong shock course through your body."
+			if(prob(2))
+				affected_mob << "\red You feel like clowning around."
+			if(prob(4))
+				for(var/obj/M in orange(4,affected_mob))
+					if(M.flags & CONDUCT)
+						if(M.x > affected_mob.x)
+							M.x-=rand(1,min(3,M.x-affected_mob.x))
+						else if(M.x < affected_mob.x)
+							M.x+=rand(1,min(3,affected_mob.x-M.x))
+						if(M.y > affected_mob.y)
+							M.y-=rand(1,min(3,M.y-affected_mob.y))
+						else if(M.y < affected_mob.y)
+							M.y+=rand(1,min(3,affected_mob.y-M.y))
+		if(4)
+			if(prob(2))
+				affected_mob << "\red You feel a powerful shock course through your body."
+			if(prob(2))
+				affected_mob << "\red You query upon the nature of miracles."
+			if(prob(8))
+				for(var/obj/M in orange(6,affected_mob))
+					if(M.flags & CONDUCT)
+						if(M.x > affected_mob.x)
+							M.x-=rand(1,min(5,M.x-affected_mob.x))
+						else if(M.x < affected_mob.x)
+							M.x+=rand(1,min(5,affected_mob.x-M.x))
+						if(M.y > affected_mob.y)
+							M.y-=rand(1,min(5,M.y-affected_mob.y))
+						else if(M.y < affected_mob.y)
+							M.y+=rand(1,min(5,affected_mob.y-M.y))
+	return

code/game/gamemodes/events.dm

@@ -233,7 +233,7 @@
 /proc/viral_outbreak()
 	command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
 	world << sound('outbreak7.ogg')
-	var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold)
+	var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis)
 	for(var/mob/living/carbon/human/H in world)
 		if((H.virus) || (H.stat == 2))
 			continue

code/game/jobs/jobprocs.dm

@@ -597,6 +597,8 @@
 	usr << "You form a wall in front of yourself."
 	var/obj/forcefield/F =  new /obj/forcefield(locate(usr.x,usr.y,usr.z))
 	F.icon_state = "empty"
+	F.name = "invisible wall"
+	F.desc = "You have a bad feeling about this."
 	spawn (300)
 		del (F)
 	return

code/game/machinery/computer/medical.dm

@@ -92,6 +92,7 @@
 					<br><a href='?src=\ref[src];vir=p'>Plasmatoid</a>
 					<br><a href='?src=\ref[src];vir=dna'>Space Rhinovirus</a>
 					<br><a href='?src=\ref[src];vir=bot'>Robot Transformation</a>
+					<br><a href='?src=\ref[src];vir=mgn'>Magnitis</A>
 					<br><a href='?src=\ref[src];screen=1'>Back</a>"}
 				if(6.0)
 					dat += "<center><b>Medical Robot Monitor</b></center>"
@@ -250,6 +251,16 @@
 <BR><b>Notes:</b> This disease, actually acute nanomachine infection, converts the victim into a cyborg.
 <BR>
 <BR><b>Severity:</b> Major"}
+					if("mgn")
+						src.temp = {"<b>Name:</b> Magnitis
+<BR><b>Number of stages:</b> 4
+<BR><b>Spread:</b> Airborne
+<BR><b>Possible Cure:</b> Iron
+<BR><b>Affected Species:</b> Human
+<BR>
+<BR><b>Notes:</b> This disease disrupts the magnetic field of your body, making it act as if a powerful magnet. Injections of iron help stabilize the field.
+<BR>
+<BR><b>Severity:</b> Medium"}
 
 			if (href_list["del_all"])
 				src.temp = text("Are you sure you wish to delete all records?<br>\n\t<A href='?src=\ref[];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)

code/game/machinery/processor.dm

@@ -47,7 +47,7 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			new /obj/item/weapon/reagent_containers/food/snacks/ketchup(src.loc)
 			return
 	user << "There doesn't appear to be anything in the processing chamber."
-/*
+
 /obj/machinery/processor/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
 	if(istype(G.affecting, /mob/living/carbon/alien/larva/metroid))
 		sleep(40)
@@ -61,9 +61,7 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			newmob:client:eye = newmob
 		del(G.affecting)
 		del(G)
-		var/obj/item/weapon/reagent_containers/food/drinks/jar/J = new /obj/item/weapon/reagent_containers/food/drinks/jar(src.loc)
-		J.add_reagent("metroid",50) //Code no work :< -- Urist
-*/
+		new /obj/item/weapon/reagent_containers/food/drinks/jar(src.loc)
 /*
 /obj/item/weapon/reagent_containers/food/snacks/grown/berries
 

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

@@ -139,11 +139,15 @@ WELDINGTOOOL
 
 /obj/item/weapon/weldingtool/afterattack(obj/O as obj, mob/user as mob)
 
-	if (istype(O, /obj/reagent_dispensers/fueltank) && get_dist(src,O) <= 1)
+	if (istype(O, /obj/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && !src.welding)
 		O.reagents.trans_to(src, 20)
 		user << "\blue Welder refueled"
 		playsound(src.loc, 'refill.ogg', 50, 1, -6)
 
+	else if (istype(O, /obj/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding)
+		user << "\red That was stupid of you."
+		explosion(O.loc,2,4,8)
+
 	else if (src.welding)
 		use_fuel(1)
 

code/game/supplyshuttle.dm

@@ -146,7 +146,8 @@ var/supply_shuttle_points = 50
 	contains = list("/obj/item/weapon/reagent_containers/glass/bottle/flu_virion",
 					"/obj/item/weapon/reagent_containers/glass/bottle/cold",
 					"/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs",
-					"/obj/item/weapon/reagent_containers/glass/bottle/gbs",
+					"/obj/item/weapon/reagent_containers/glass/bottle/magnitis",
+//					"/obj/item/weapon/reagent_containers/glass/bottle/gbs", No. Just no.
 					"/obj/item/weapon/reagent_containers/glass/bottle/brainrot",
 					"/obj/item/weapon/storage/firstaid/syringes",
 					"/obj/item/weapon/storage/beakerbox")

code/modules/admin/admin.dm

@@ -1122,6 +1122,9 @@ var/showadminmessages = 1
 					if(aliens_allowed)
 						alien_infestation()
 						message_admins("[key_name_admin(usr)] has spawned aliens", 1)
+				if("virus")
+					viral_outbreak()
+					message_admins("[key_name_admin(usr)] has spawned a virus outbreak", 1)
 				if("retardify")
 					if (src.rank in list("Shit Guy", "Coder", "Host"))
 						for(var/mob/living/carbon/human/H in world)
@@ -1491,6 +1494,7 @@ var/showadminmessages = 1
 <A href='?src=\ref[src];secretsfun=timeanomalies'>Spawn wormholes (Untested)</A><BR>
 <A href='?src=\ref[src];secretsfun=goblob'>Spawn magma(Untested)</A><BR>
 <A href='?src=\ref[src];secretsfun=aliens'>Trigger an Alien infestation</A><BR>
+<A href='?src=\ref[src];secretsfun=virus'>Trigger an Virus Outbreak</A><BR>
 <A href='?src=\ref[src];secretsfun=flicklights'>Ghost Mode</A><BR>
 <A href='?src=\ref[src];secretsfun=cleanexcrement'>Remove all urine/poo from station</A><BR>
 <A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>

code/modules/admin/verbs/playsound.dm

@@ -40,6 +40,8 @@
 	set category = "Fun"
 	set name = "Cuban Pete Time"
 
+	message_admins("[key_name_admin(usr)] has declared Cuban Pete Time!", 1)
+
 	for(var/mob/M in world)
 		if(M.midis)
 			M << 'cubanpetetime.ogg'

goonstation.dme

@@ -173,6 +173,7 @@
 #include "code\datums\diseases\flu.dm"
 #include "code\datums\diseases\gbs.dm"
 #include "code\datums\diseases\jungle_fever.dm"
+#include "code\datums\diseases\magnitis.dm"
 #include "code\datums\diseases\plasmatoid.dm"
 #include "code\datums\diseases\robotic_transformation.dm"
 #include "code\datums\diseases\xeno_transformation.dm"