diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 46933979158..36d0101e1eb 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -567,11 +567,10 @@
..()
- if(!seed)
+ if(seed)
+ usr << "[seed.display_name] are growing here."
+ else
usr << "[src] is empty."
- return
-
- usr << "[seed.display_name] are growing here."
if(!Adjacent(usr))
return
@@ -579,29 +578,30 @@
usr << "Water: [round(waterlevel,0.1)]/100"
usr << "Nutrient: [round(nutrilevel,0.1)]/10"
- if(weedlevel >= 5)
- usr << "\The [src] is infested with weeds!"
- if(pestlevel >= 5)
- usr << "\The [src] is infested with tiny worms!"
-
- if(dead)
- usr << "The plant is dead."
- else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2))
- usr << "The plant looks unhealthy."
+ if(seed)
+ if(weedlevel >= 5)
+ usr << "\The [src] is infested with weeds!"
+ if(pestlevel >= 5)
+ usr << "\The [src] is infested with tiny worms!"
+ if(dead)
+ usr << "The plant is dead."
+ else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2))
+ usr << "The plant looks unhealthy."
if(mechanical)
var/turf/T = loc
var/datum/gas_mixture/environment
- if(closed_system && (connected_port || holding))
+ var/environment_type
+ if(closed_system && (connected_port || holding) && air_contents)
environment = air_contents
-
- if(!environment)
+ environment_type = "connected"
+ else
if(istype(T))
environment = T.return_air()
-
- if(!environment) //We're in a crate or nullspace, bail out.
- return
+ if(!environment) //We're in a crate or nullspace, bail out.
+ return
+ environment_type = "surrounding"
var/light_string
if(closed_system && mechanical)
@@ -615,7 +615,7 @@
light_available = 5
light_string = "a light level of [light_available] lumens"
- usr << "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K."
+ usr << "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K at [environment.return_pressure()] kPa in the [environment_type] environment"
/obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb()
set name = "Toggle Tray Lid"
@@ -623,7 +623,7 @@
set src in view(1)
if(usr.incapacitated())
return
-
+
if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
close_lid(usr)
return
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index 1c07a845bb0..1a76ad22fd0 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -96,7 +96,7 @@
dat += "
This sample contains: "
for(var/datum/reagent/R in grown_reagents.reagent_list)
- dat += "
- [R.id], [grown_reagents.get_reagent_amount(R.id)] unit(s)"
+ dat += "
- [R.name], [grown_reagents.get_reagent_amount(R.id)] unit(s)"
dat += "