O7S Timeline fix (#45)
O7S Timeline fix (#45)

* O7S Timeline fix

* Fixing more times on O7S

* More O7S timing changes

sqt/cactbot,quisquous/cactbot,quisquous/cactbot,quisquous/cactbot,sqt/cactbot,quisquous/cactbot,sqt/cactbot,quisquous/cactbot,sqt/cactbot,quisquous/cactbot,sqt/cactbot