im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)

* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
This commit is contained in:
kevinz000
2017-07-15 11:41:36 -07:00
committed by GitHub
parent 9d0cd37dd3
commit 44742cb115
56 changed files with 255 additions and 210 deletions
@@ -41,9 +41,6 @@
user.reagents.add_reagent("antihol", 10)
user.reagents.add_reagent("mannitol", 25)
for(var/thing in user.viruses)
var/datum/disease/D = thing
if(D.severity == NONTHREAT)
continue
for(var/datum/disease/D in user.viruses)
D.cure()
return TRUE
@@ -133,9 +133,10 @@
to_chat(owner, "<span class='warning'>You feel sick.</span>")
var/virus_type = pick(/datum/disease/beesease, /datum/disease/brainrot, /datum/disease/magnitis)
var/datum/disease/D = new virus_type()
D.carrier = TRUE
D.carrier = 1
owner.viruses += D
D.affected_mob = owner
D.holder = owner
owner.med_hud_set_status()
@@ -60,6 +60,7 @@
var/datum/disease/D = new /datum/disease/transformation/jungle_fever
D.visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
D.holder = carriermind.current
D.affected_mob = carriermind.current
carriermind.current.viruses += D
..()