Fixes turrets not attacking in rooms, had to do with battery checking
Merge remote-tracking branch 'origin/master'