update 1.2.5

-more bug fixes
-combat update coming in 1.3.0
-fnaf update coming 1.3.1
all is going great!