Fixing a bug in the cyborg taser that caused it to continue draining cell-power from the cyborg even after it had finished recharging.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge pull request #3672 from jack-fractal/master

Fixing a bug in the cyborg taser that caused it to continue draining cel...