-Lot of runtime fixes for advance diseases.

-Added two new symptoms, fever and itching.
-Changed some stats on existing symptoms.
-Emotes sucks so I used visible_message if there was no preset emote.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5021 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-11-07 08:21:36 +00:00
parent 698f86152c
commit 0162968399
10 changed files with 135 additions and 42 deletions
+12 -3
View File
@@ -503,7 +503,8 @@
D = archive_diseases[path]
vaccine_type = path
else
D = new vaccine_type(0, null)
if(vaccine_type in diseases)
D = new vaccine_type(0, null)
if(D)
B.name = "[D.name] vaccine bottle"
@@ -531,9 +532,11 @@
var/datum/disease/D = null
if(!type)
var/datum/disease/advance/A = archive_diseases[href_list["create_virus_culture"]]
D = new A.type(0, A)
if(A)
D = new A.type(0, A)
else
D = new type(0, null)
if(type in diseases) // Make sure this is a disease
D = new type(0, null)
var/list/data = list("viruses"=list(D))
var/name = sanitize(input(usr,"Name:","Name the culture",D.name))
if(!name || name == " ") name = D.name
@@ -597,6 +600,8 @@
dat += "The beaker is empty<BR>"
else if(!Blood)
dat += "No blood sample found in beaker"
else if(!Blood.data)
dat += "No blood data found in beaker."
else
dat += "<h3>Blood sample data:</h3>"
dat += "<b>Blood DNA:</b> [(Blood.data["blood_DNA"]||"none")]<BR>"
@@ -617,6 +622,9 @@
D = archive_diseases[A.GetDiseaseID()]
disease_creation = A.GetDiseaseID()
if(!D)
CRASH("We weren't able to get the advance disease from the archive.")
dat += "<b>Disease Agent:</b> [D?"[D.agent] - <A href='?src=\ref[src];create_virus_culture=[disease_creation]'>Create virus culture bottle</A>":"none"]<BR>"
dat += "<b>Common name:</b> [(D.name||"none")]<BR>"
dat += "<b>Description: </b> [(D.desc||"none")]<BR>"
@@ -658,6 +666,7 @@
onclose(user, "pandemic")
return
/obj/machinery/computer/pandemic/attackby(var/obj/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+2 -2
View File
@@ -459,8 +459,8 @@ datum
name = "Mix Virus"
id = "mixvirus"
result = "blood"
required_reagents = list("blood" = 5, "virusfood" = 5)
result_amount = 5
required_reagents = list("blood" = 1, "virusfood" = 5)
result_amount = 1
var/level = 2
on_reaction(var/datum/reagents/holder, var/created_volume)