diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 5f2b90463f2..2322bbad5ca 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -61,20 +61,12 @@ var/msg = "*---------*\n This is \a [src].\n" if(seed) msg += seed.get_analyzer_text() - msg += "\n- Nutritional value: [reagents.get_reagent_amount("nutriment")]\n" - msg += "- Other substances: [reagents.total_volume-reagents.get_reagent_amount("nutriment")]\n" - msg += "*---------*" - - var/list/scannable_reagents = list("charcoal" = "Charcoal", "morphine" = "Morphine", "amanitin" = "Amatoxins", - "toxin" = "Toxins", "psilocybin" = "Psilocybin", "condensedcapsaicin" = "Condensed Capsaicin", - "capsaicin" = "Capsaicin", "frostoil" = "Frost Oil", "gold" = "Mineral Content", "glycerol" = "Glycerol", - "radium" = "Highly Radioactive Material", "uranium" = "Radioactive Material") var/reag_txt = "" if(seed) - for(var/reagent_id in scannable_reagents) - if(reagent_id in seed.reagents_add) - var/amt = reagents.get_reagent_amount(reagent_id) - reag_txt += "\n- [scannable_reagents[reagent_id]]: [amt*100/reagents.maximum_volume]%" + for(var/reagent_id in seed.reagents_add) + var/datum/reagent/R = chemical_reagents_list[reagent_id] + var/amt = reagents.get_reagent_amount(reagent_id) + reag_txt += "\n- [R.name]: [amt]" if(reag_txt) msg += reag_txt diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 6432f6c6233..66d33875bfe 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -290,6 +290,12 @@ text += "- Weed Vulnerability: [weed_chance]\n" if(rarity) text += "- Species Discovery Value: [rarity]\n" + var/all_traits = "" + for(var/datum/plant_gene/trait/traits in genes) + if(istype(traits, /datum/plant_gene/trait/plant_type)) + continue + all_traits += " [traits.get_name()]" + text += "- Plant Traits:[all_traits]\n" text += "*---------*" diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index e27670faa90..f7b5a36e1a9 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -205,13 +205,13 @@ var/potDiff = S.potency - shuttle_master.discoveredPlants[S.type] // Compare it to the previous best if(potDiff > 0) // This sample is better shuttle_master.discoveredPlants[S.type] = S.potency - msg += "+[potDiff]: New sample of \"[capitalize(S.species)]\" is superior. Good work.
" + msg += "+[potDiff]: New sample of \"[capitalize(S.species)]\" is superior. Good work.
" shuttle_master.points += potDiff else // This sample is worthless msg += "+0: New sample of \"[capitalize(S.species)]\" is not more potent than existing sample ([shuttle_master.discoveredPlants[S.type]] potency).
" else // This is a new discovery! shuttle_master.discoveredPlants[S.type] = S.potency - msg += "[S.rarity]: New species discovered: \"[capitalize(S.species)]\". Excellent work.
" + msg += "[S.rarity]: New species discovered: \"[capitalize(S.species)]\". Excellent work.
" shuttle_master.points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later qdel(MA) shuttle_master.sold_atoms += "."