-Admins can now make their own advance diseases via the secret button! Instead of the useless "virus2" button, there will now be an option called "Create Your Own"! Use this button and pick from 5 symptoms to make your disease from.

-Fixed a bug where blood/vomit decals would be creating new viruses.
-Medical computer won't recognize advance diseases... for now.
-Used english_list when displaying symptoms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5100 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-11-17 19:53:00 +00:00
parent e86ba45882
commit e2acdcfe47
12 changed files with 66 additions and 37 deletions
+5 -5
View File
@@ -459,7 +459,7 @@ its easier to just keep the beam vertical.
if(!B.blood_DNA[M.dna.unique_enzymes])
B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
for(var/datum/disease/D in M.viruses)
var/datum/disease/newDisease = new D.type
var/datum/disease/newDisease = D.Copy(1)
B.viruses += newDisease
newDisease.holder = B
return 1 //we bloodied the floor
@@ -468,7 +468,7 @@ its easier to just keep the beam vertical.
var/obj/effect/decal/cleanable/blood/newblood = new /obj/effect/decal/cleanable/blood(T)
newblood.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
for(var/datum/disease/D in M.viruses)
var/datum/disease/newDisease = new D.type
var/datum/disease/newDisease = D.Copy(1)
newblood.viruses += newDisease
newDisease.holder = newblood
return 1 //we bloodied the floor
@@ -493,7 +493,7 @@ its easier to just keep the beam vertical.
this.icon_state = "vomittox_[pick(1,4)]"
for(var/datum/disease/D in M.viruses)
var/datum/disease/newDisease = new D.type
var/datum/disease/newDisease = D.Copy(1)
this.viruses += newDisease
newDisease.holder = this
@@ -505,7 +505,7 @@ its easier to just keep the beam vertical.
var/obj/effect/decal/cleanable/blood/this = new /obj/effect/decal/cleanable/blood(source1)
this.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
for(var/datum/disease/D in M.viruses)
var/datum/disease/newDisease = new D.type
var/datum/disease/newDisease = D.Copy(1)
this.viruses += newDisease
newDisease.holder = this
@@ -515,7 +515,7 @@ its easier to just keep the beam vertical.
var/obj/effect/decal/cleanable/xenoblood/this = new /obj/effect/decal/cleanable/xenoblood(source2)
this.blood_DNA["UNKNOWN BLOOD"] = "X*"
for(var/datum/disease/D in M.viruses)
var/datum/disease/newDisease = new D.type
var/datum/disease/newDisease = D.Copy(1)
this.viruses += newDisease
newDisease.holder = this
+4 -4
View File
@@ -206,7 +206,7 @@
// world << sound('sound/AI/outbreak7.ogg')
var/virus_type
if(!virus)
virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat)
virus_type = pick(/datum/disease/dnaspread,/datum/disease/advance/flu,/datum/disease/advance/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat)
else
switch(virus)
if("fake gbs")
@@ -220,16 +220,16 @@
if("brain rot")
virus_type = /datum/disease/brainrot
if("cold")
virus_type = /datum/disease/cold
virus_type = /datum/disease/advance/cold
if("retrovirus")
virus_type = /datum/disease/dnaspread
if("flu")
virus_type = /datum/disease/flu
virus_type = /datum/disease/advance/flu
// if("t-virus")
// virus_type = /datum/disease/t_virus
if("pierrot's throat")
virus_type = /datum/disease/pierrot_throat
for(var/mob/living/carbon/human/H in living_mob_list)
for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
var/foundAlready = 0 // don't infect someone that already has the virus
for(var/datum/disease/D in H.viruses)
+2
View File
@@ -74,6 +74,8 @@
dat += "<CENTER><B>Virus Database</B></CENTER>"
for(var/Dt in typesof(/datum/disease/))
var/datum/disease/Dis = new Dt(0)
if(istype(Dis, /datum/disease/advance))
continue // TODO (tm): Add advance diseases to the virus database which no one uses.
if(!Dis.desc)
continue
dat += "<br><a href='?src=\ref[src];vir=[Dt]'>[Dis.name]</a>"
+1 -1
View File
@@ -82,7 +82,7 @@
for(var/datum/disease/D in O.viruses)
if(D.spread_type != SPECIAL)
B.data["viruses"] = new D.type(0, D)
B.data["viruses"] = D.Copy()
B.data["blood_DNA"] = copytext(O.dna.unique_enzymes,1,0)
if(O.resistances&&O.resistances.len)
@@ -26,7 +26,7 @@
if (i > 0)
var/obj/effect/decal/cleanable/xenoblood/b = new /obj/effect/decal/cleanable/xenoblood/xsplatter(src.loc)
for(var/datum/disease/D in src.viruses)
b.viruses += new D.type(0, D, 1)
b.viruses += D.Copy()
if (step_to(src, get_step(src, direction), 0))
break
@@ -69,6 +69,6 @@
if (i > 0)
var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
for(var/datum/disease/D in src.viruses)
b.viruses += new D.type(0, D, 1)
b.viruses += D.Copy()
if (step_to(src, get_step(src, direction), 0))
break
+1 -1
View File
@@ -47,7 +47,7 @@
if(viruses.len > 0)
for(var/datum/disease/D in viruses)
if(prob(virusProb))
var/datum/disease/viruus = new D.type(0, D, 1)
var/datum/disease/viruus = D.Copy()
gib.viruses += viruus
viruus.holder = gib
viruus.spread_type = CONTACT_FEET