cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5545 from RemieRichards/DiseaseRework

Browse Source 
Disease Code Partial Rework
This commit is contained in:
Cheridan
2014-11-08 00:17:47 -06:00
parent a9d1963eb6 3731747d11
commit 53bf024dbe
42 changed files with 525 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/effects/gibs.dm
View File

@@ -28,9 +28,6 @@
return
var/obj/effect/decal/cleanable/blood/gibs/gib = null
for(var/datum/disease/D in viruses)
if(D.spread_type == SPECIAL)
del(D)
if(sparks)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread

4
code/game/objects/items/devices/scanners.dm
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)