diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index cf555ba5e07..c5aa5f45ffe 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -760,44 +760,53 @@ var/global/list/plant_icon_cache = list() else if(dead) remove_dead(user) +/obj/machinery/portable_atmospherics/hydroponics/examine() + + ..() + + if(!Adjacent(usr)) + return + + if(seed) + usr << "[src] has [seed.display_name] planted." + if(dead) + usr << "The plant is dead." + else if(health <= (seed.endurance / 2)) + usr << "The plant looks unhealthy." else - if(seed && !dead) - usr << "[src] has [seed.display_name] planted." - if(health <= (seed.endurance / 2)) - usr << "The plant looks unhealthy." - else - usr << "[src] is empty." - usr << "Water: [round(waterlevel,0.1)]/100" - usr << "Nutrient: [round(nutrilevel,0.1)]/10" - if(weedlevel >= 5) - usr << "[src] is filled with weeds!" - if(pestlevel >= 5) - usr << "[src] is filled with tiny worms!" + usr << "[src] is empty." + usr << "Water: [round(waterlevel,0.1)]/100" + usr << "Nutrient: [round(nutrilevel,0.1)]/10" - if(!istype(src,/obj/machinery/portable_atmospherics/hydroponics/soil)) + if(weedlevel >= 5) + usr << "[src] is filled with weeds!" + if(pestlevel >= 5) + usr << "[src] is filled with tiny worms!" - var/turf/T = loc - var/datum/gas_mixture/environment + if(!istype(src,/obj/machinery/portable_atmospherics/hydroponics/soil)) - if(closed_system && (connected_port || holding)) - environment = air_contents + var/turf/T = loc + var/datum/gas_mixture/environment - if(!environment) - if(istype(T)) - environment = T.return_air() + if(closed_system && (connected_port || holding)) + environment = air_contents - if(!environment) //We're in a crate or nullspace, bail out. - return + if(!environment) + if(istype(T)) + environment = T.return_air() - var/area/A = T.loc - var/light_available - if(A) - if(A.lighting_use_dynamic) - light_available = max(0,min(10,T.lighting_lumcount)-5) - else - light_available = 5 + if(!environment) //We're in a crate or nullspace, bail out. + return - usr << "The tray's sensor suite is reporting a light level of [light_available] lumens and a temperature of [environment.temperature]K." + var/area/A = T.loc + var/light_available + if(A) + if(A.lighting_use_dynamic) + light_available = max(0,min(10,T.lighting_lumcount)-5) + else + light_available = 5 + + usr << "The tray's sensor suite is reporting a light level of [light_available] lumens and a temperature of [environment.temperature]K." /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid() set name = "Toggle Tray Lid" diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 875583f92af..991187eee2d 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -1553,7 +1553,7 @@ proc/populate_seed_list() packet_icon = "seed-soybean" product_icon = "bean" product_colour = "#EBE7C0" - plant_icon = "stalk4" + plant_icon = "stalk" /datum/seed/wheat name = "wheat" @@ -1654,7 +1654,7 @@ proc/populate_seed_list() product_icon = "stalk" product_colour = "#B4D6BD" plant_colour = "#6BBD68" - plant_icon = "stalk4" + plant_icon = "stalk3" /datum/seed/watermelon name = "watermelon" diff --git a/icons/obj/hydroponics_growing.dmi b/icons/obj/hydroponics_growing.dmi index e3b5e8df951..2b3d67b6e51 100644 Binary files a/icons/obj/hydroponics_growing.dmi and b/icons/obj/hydroponics_growing.dmi differ