Merge pull request #3390 from Segrain/master

Map fixes.
Fixes #3383
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Removed a very very redundant check in the ablative armour code. Thanks Segrain.
Merge pull request #3385 from Zuhayr/master

Taser runtime fix.
Fix for #3392.