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>
Merge pull request #2438 from caelaislinn/bleeding-edge-freeze

Shield gen fixes and tweaks, finance tweaks, random other tweaks
Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.
Returned Set Flavour Text to humans, added Set Pose and Set Flavour Text to robots.
Merge pull request #2440 from Zuhayr/master

Robot changes, Set Flavour verb.
Side indicator on targeting dolly.
Fixes #2441
Merge pull request #2446 from Baystation12/BEF-staging

Bef staging
Condensed capsaicin effects increased to pre-merge levels.
Merge pull request #2448 from RavingManiac/bleeding-edge-freeze

Condensed capsaicin effects increased to pre-merge levels.
Merge pull request #2427 from Baystation12/BEF-staging

Merge on 26th February
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Fixes GAPING SPACE HOLE in Virology lab.
Department accounts are created now and credentials given to heads.
Merge pull request #2452 from comma/master

Minor fixes
Accidentally had removed include.
Added extra safety check.
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
Opens the ERT debug-command preset for actual use.