Merge pull request #5852 from Citadel-Station-13/upstream-merge-36198

[MIRROR] Disease fixes
This commit is contained in:
deathride58
2018-03-08 05:58:11 +00:00
committed by GitHub
4 changed files with 15 additions and 9 deletions
+3 -5
View File
@@ -109,6 +109,7 @@
A.symptoms += S.Copy()
A.properties = properties.Copy()
A.id = id
A.mutable = mutable
//this is a new disease starting over at stage 1, so processing is not copied
return A
@@ -166,13 +167,10 @@
var/the_id = GetDiseaseID()
if(!SSdisease.archive_diseases[the_id])
if(new_name)
AssignName()
SSdisease.archive_diseases[the_id] = src // So we don't infinite loop
SSdisease.archive_diseases[the_id] = Copy()
var/datum/disease/advance/A = SSdisease.archive_diseases[the_id]
name = A.name
if(new_name)
AssignName()
//Generate disease properties based on the effects. Returns an associated list.
/datum/disease/advance/proc/GenerateProperties()