diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm index 810b13e6d0d..735fc037486 100644 --- a/code/modules/reagents/chemistry/items.dm +++ b/code/modules/reagents/chemistry/items.dm @@ -124,12 +124,21 @@ out_message += "Chemicals found in [interacting_with.name]:\n" if(cont.reagents.is_reacting) out_message += "[span_warning("A reaction appears to be occuring currently.")]\n" - for(var/datum/reagent/reagent in cont.reagents.reagent_list) + for(var/datum/reagent/reagent as anything in cont.reagents.reagent_list) // bloodtyping if blood present in container + var/blood_info = null + if(reagent.data) + var/blood = reagent.data["blood_type"] + if(istype(blood, /datum/blood_type)) + var/datum/blood_type/blood_type = blood + var/type = blood_type.get_type() + blood_info = "[blood_type.get_blood_name()] [type ? "(type: [type])" : ""]" + else if(blood) + blood_info = "[reagent.name] (type: [blood])" if(reagent.purity < reagent.inverse_chem_val && reagent.inverse_chem) //If the reagent is impure var/datum/reagent/inverse_reagent = GLOB.chemical_reagents_list[reagent.inverse_chem] out_message += "[span_warning("Inverted reagent detected: ")][round(reagent.volume, 0.01)]u of [inverse_reagent.name], Purity: [round(1 - reagent.purity, 0.000001)*100]%, [(scanmode?"[(inverse_reagent.overdose_threshold?"Overdose: [inverse_reagent.overdose_threshold]u, ":"")]Base pH: [initial(inverse_reagent.ph)], Current pH: [reagent.ph].":"Current pH: [reagent.ph].")]\n" else - out_message += "[round(reagent.volume, 0.01)]u of [reagent.name], Purity: [round(reagent.purity, 0.000001)*100]%, [(scanmode?"[(reagent.overdose_threshold?"Overdose: [reagent.overdose_threshold]u, ":"")]Base pH: [initial(reagent.ph)], Current pH: [reagent.ph].":"Current pH: [reagent.ph].")]\n" + out_message += "[round(reagent.volume, CHEMICAL_VOLUME_ROUNDING)]u of [blood_info || reagent.name], Purity: [round(reagent.purity, 0.000001)*100]%, [(scanmode?"[(reagent.overdose_threshold?"Overdose: [reagent.overdose_threshold]u, ":"")]Base pH: [initial(reagent.ph)], Current pH: [reagent.ph].":"Current pH: [reagent.ph].")]\n" if(scanmode) out_message += "Analysis: [reagent.description]\n" to_chat(user, boxed_message(span_notice("[out_message.Join()]")))