Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

Conflicts:
	code/modules/events/infestation.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Side indicator on targeting dolly.
Fixes #2441
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Fixes GAPING SPACE HOLE in Virology lab.
Merge pull request #2452 from comma/master

Minor fixes
Merge branch 'master' of https://github.com/Baystation12/Baystation12

Conflicts:
	code/modules/events/infestation.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
tweakfixes to finances

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #2456 from caelaislinn/master

tweakfixes to finances
atm fix mk 2

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
fixed an issue with database reconnection

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
some useability tweaks to atms

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #2462 from caelaislinn/master

ATM fix for real