Fix bug where happiness doesn't decrease



<!---
@huboard:{"order":4.5,"custom_state":""}
-->