Virology fixes (#29428)

* Pandemic now reads data from the virus itself rather than the global copy

* Fixes id mismatch
This commit is contained in:
XDTM
2017-07-23 00:10:40 +02:00
committed by Leo
parent f586e52ce8
commit e72b6767ed
2 changed files with 6 additions and 4 deletions
+2 -1
View File
@@ -294,6 +294,8 @@
var/list/L = list()
for(var/datum/symptom/S in symptoms)
L += S.id
if(S.neutered)
L += "N"
L = sortList(L) // Sort the list so it doesn't matter which order the symptoms are in.
var/result = jointext(L, ":")
id = result
@@ -324,7 +326,6 @@
if(!S.neutered)
S.neutered = TRUE
S.name += " (neutered)"
S.id += "N" //new disease is unique
/*
@@ -46,10 +46,11 @@
var/list/this = list()
this["name"] = D.name
if(istype(D, /datum/disease/advance))
var/datum/disease/advance/A = SSdisease.archive_diseases[D.GetDiseaseID()]
if(A.name == "Unknown")
var/datum/disease/advance/A = D
var/datum/disease/advance/archived = SSdisease.archive_diseases[D.GetDiseaseID()]
if(archived.name == "Unknown")
this["can_rename"] = TRUE
this["name"] = A.name
this["name"] = archived.name
this["is_adv"] = TRUE
this["resistance"] = A.totalResistance()
this["stealth"] = A.totalStealth()