Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066

[MIRROR] Refactors virus spreading
This commit is contained in:
LetterJay
2017-10-10 02:46:04 -04:00
committed by GitHub
60 changed files with 1089 additions and 1013 deletions
@@ -43,7 +43,7 @@
for(var/thing in user.viruses)
var/datum/disease/D = thing
if(D.severity == NONTHREAT)
if(D.severity == VIRUS_SEVERITY_POSITIVE)
continue
D.cure()
return TRUE
@@ -2,7 +2,7 @@
name = "Unnatural Wasting"
max_stages = 5
stage_prob = 10
spread_flags = NON_CONTAGIOUS
spread_flags = VIRUS_SPREAD_NON_CONTAGIOUS
cure_text = "Holy water or extensive rest."
spread_text = "A burst of unholy energy"
cures = list("holywater")
@@ -11,7 +11,7 @@
viable_mobtypes = list(/mob/living/carbon/human)
disease_flags = CURABLE
permeability_mod = 1
severity = BIOHAZARD
severity = VIRUS_SEVERITY_HARMFUL
var/stagedamage = 0 //Highest stage reached.
var/finalstage = 0 //Because we're spawning off the cure in the final stage, we need to check if we've done the final stage's effects.