Diona Nymph and Light Level Fixes

- Fixes Diona Nymphs getting a color overlay, which was causing them to
become darker and look terrible.
- They now look like they did pre-#980

- Adjusts the equation for hydroponics trays calculating light level
based on their turf (lid down)
- All trays in hydroponics should now have a light level of 3 or higher,
this is subject to further adjustments to fine-tune

- Fixed messages from the eject tank verb to not say things like "the
the tray (#45)"
This commit is contained in:
FalseIncarnate
2015-05-13 16:14:46 -04:00
parent b602e3d5e3
commit 719b98f43f
2 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -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)
+3 -3
View File
@@ -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