From e154d69b0b2d3f3d399a0a4795a9fb4984a16f49 Mon Sep 17 00:00:00 2001 From: Menshin Date: Sat, 7 Feb 2015 13:18:51 +0100 Subject: [PATCH 1/2] * Fixes warnings related to add_reagent when trying to inject blood containing reagents * Fixes sleepers showing reagent id instead of name * Some formatting adjustments to the mass spectrometer output * Make the "Saline-Glucose Solution" name fit in one line. --- code/game/machinery/Sleeper.dm | 6 ++-- code/game/objects/items/devices/scanners.dm | 35 +++++++++++-------- code/modules/mob/living/carbon/human/blood.dm | 5 ++- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7a2d043f107..8e39fdd7453 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -125,7 +125,7 @@ var/dat dat += "

Injector

" if(occupant) - dat += "Inject epinephrine" + dat += "Inject Epinephrine" else dat += "Inject Epinephrine" if(occupant && occupant.health > min_health) @@ -168,7 +168,7 @@ dat += "
Significant brain damage detected.
" if(occupant.reagents.reagent_list.len) for(var/datum/reagent/R in occupant.reagents.reagent_list) - dat += text("
[R.name]:
[] units
", round(R.volume, 0.1)) + dat += "
[R.name]:
[round(R.volume, 0.1)] units
" dat += "" var/datum/browser/popup = new(user, "sleeper", "Sleeper Console", 520, 540) //Set up the popup browser window @@ -221,7 +221,7 @@ if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) occupant.reagents.add_reagent(chem, 10) var/units = round(occupant.reagents.get_reagent_amount(chem)) - user << "Occupant now has [units] unit\s of [chem] in their bloodstream." + user << "Occupant now has [units] unit\s of [chemical_reagents_list[chem]] in their bloodstream." /obj/machinery/sleeper/update_icon() if(state_open) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 41877c85f4e..014d994dfb2 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -306,22 +306,27 @@ MASS SPECTROMETER else blood_traces = params2list(R.data["trace_chem"]) break - var/dat = "Trace Chemicals Found: " - for(var/R in blood_traces) - if(prob(reliability)) - if(details) - dat += "[R] ([blood_traces[R]] units) " + var/dat = "Trace Chemicals Found:" + if(!blood_traces.len) + dat += "
None" + else + for(var/R in blood_traces) + if(prob(reliability)) + dat += "
[chemical_reagents_list[R]]" + + if(details) + dat += " ([blood_traces[R]] units)" + + recent_fail = 0 else - dat += "[R] " - recent_fail = 0 - else - if(recent_fail) - crit_fail = 1 - reagents.clear_reagents() - return - else - recent_fail = 1 - user << "[dat]" + if(recent_fail) + crit_fail = 1 + reagents.clear_reagents() + return + else + recent_fail = 1 + dat += "" + user << dat reagents.clear_reagents() return diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index 418e111c630..665152689af 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -159,8 +159,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 B.data["resistances"] = src.resistances.Copy() var/list/temp_chem = list() for(var/datum/reagent/R in src.reagents.reagent_list) - temp_chem += R.name - temp_chem[R.name] = R.volume + temp_chem[R.id] = R.volume B.data["trace_chem"] = list2params(temp_chem) if(mind) B.data["mind"] = src.mind @@ -206,7 +205,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 container.reagents.remove_reagent("blood", amount) -//Transfers blood from container to vessels, respecting blood types compatability. +//Transfers blood from container to vessels, respecting blood types compatibility. /mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, var/amount) var/datum/reagent/blood/injected = get_blood(container.reagents) From 66f79d09d343b2eba9c98972219353402a92ae90 Mon Sep 17 00:00:00 2001 From: Menshin Date: Sat, 7 Feb 2015 16:36:34 +0100 Subject: [PATCH 2/2] Missed one. --- code/game/machinery/Sleeper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 8e39fdd7453..d3a45be951c 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -161,7 +161,7 @@ dat += "
\> Toxin Content:
[occupant.getToxLoss()]%
" dat += "
\> Burn Severity:
[occupant.getFireLoss()]%
" - dat += "
Paralysis Summary:
[round(occupant.paralysis)]% [occupant.paralysis ? "([round(occupant.paralysis / 4)] seconds left)" : ""]
" + dat += "
Paralysis Summary:
[round(occupant.paralysis)]% [occupant.paralysis ? "([round(occupant.paralysis / 4)] seconds left)" : ""]
" if(occupant.getCloneLoss()) dat += "
Subject appears to have cellular damage.
" if(occupant.getBrainLoss())