Merge branch 'master' into upstream-merge-30494

This commit is contained in:
LetterJay
2017-09-12 02:40:24 -05:00
committed by GitHub
173 changed files with 8361 additions and 5643 deletions
+1 -1
View File
@@ -248,7 +248,7 @@
if(istype(src, /obj/machinery/hydroponics/soil))
add_atom_colour(rgb(255, 175, 0), FIXED_COLOUR_PRIORITY)
else
overlays += mutable_appearance('icons/obj/hydroponics/equipment.dmi', "gaia_blessing")
add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "gaia_blessing"))
set_light(3)
update_icon_hoses()