diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 28486a254d4..0e4e7d56ac1 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -689,7 +689,8 @@ else product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name) if(get_trait(TRAIT_PRODUCT_COLOUR)) - product.color = get_trait(TRAIT_PRODUCT_COLOUR) + if(!has_mob_product || (has_mob_product && has_mob_product != /mob/living/carbon/monkey/diona)) + product.color = get_trait(TRAIT_PRODUCT_COLOUR) if(istype(product,/obj/item/weapon/reagent_containers/food)) var/obj/item/weapon/reagent_containers/food/food = product food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 4e27c704b31..23e7afa0fd7 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -810,7 +810,7 @@ var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T var/light_available if(L) - light_available = max(0,min(10,L.lum_r + L.lum_g + L.lum_b)-5) + light_available = max(0,min(10,L.lum_r + L.lum_g + L.lum_b)) else light_available = 5 light_string = "a light level of [light_available] lumens" @@ -842,9 +842,9 @@ return if(!holding) - usr << "\red There is no tank loaded into the [src] to eject." + usr << "\red There is no tank loaded into [src] to eject." if(istype(holding, /obj/item/weapon/tank)) - usr << "\blue You eject the [holding.name] from the [src]." + usr << "\blue You eject [holding.name] from [src]." holding.loc = loc holding = null