Merge pull request #3067 from NicholasDV/enhancementsAndFeatures

Adds in the Kida
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
With a brand new spanking BEF pull.
Merge pull request #3073 from misterbook/bleeding-edge-freeze

Monkey Taser Fix