Merge branch 'master' into watertime

pull/1/head
Jake Funke 2017-03-09 01:43:05 +00:00
commit 8ba3f3ee9c
1 changed files with 0 additions and 1 deletions

View File

@ -26,7 +26,6 @@ from menu_screen import *
# interaction
# - look at plant, how do you feel? (also gets rid of pests)
#
# if >5 days with no water, plant dies
# events
# - heatwave
# - rain