Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Merge branch 'dev' into dev-freeze
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev-freeze
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
Merge pull request #3348 from Segrain/master

Minor bugfixes.
Added employment records.
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.

Signed-off-by: Jamini <mobiousjami@gmail.com>
Fixed a few small issues with admin-ERT

* ERTs will no longer show up as "unknown" in the traitor panel, deadchat, and at the end of the round, among other places.
* Added update_icons() -> You no longer need to trigger it manually by clicking something
Merge pull request #3350 from Kilakk/dev

Fixed a few small issues with admin-ERT
Merge pull request #3349 from Jamini/dev

Added employment records.
ZAS fix.  It should now be possible to repair breaches without admin intervention.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Made mechas able to bump-mine
Merge pull request #3352 from Mloc/zasfixes

ZAS fix.  It should now be possible to repair breaches without admin int...
Merge pull request #3353 from softmix/dev

Made mechas able to bump-mine
Reactiveness update part 1:  Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #3354 from Mloc/clicktiming

Reactiveness update part 1:  Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
Fix for bots breaking if they fail to path
Merge remote-tracking branch 'upstream/dev' into dev