Merge pull request #5545 from RemieRichards/DiseaseRework

Disease Code Partial Rework
This commit is contained in:
Cheridan
2014-11-08 00:17:47 -06:00
42 changed files with 525 additions and 757 deletions

View File

@@ -148,8 +148,8 @@ MASS SPECTROMETER
user.show_message("<span class='warning'>Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.</span>", 1)
for(var/datum/disease/D in M.viruses)
if(!D.hidden[SCANNER])
user.show_message("<span class='warning'><b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]</span>", 1)
if(!(D.visibility_flags & HIDDEN_SCANNER))
user.show_message("<span class='warning'><b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]</span>", 1)
if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
user.show_message("<span class='notice'>Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.</span>", 1)