Couple disposal fixes

Because disposals need more love
Merge pull request #1173 from Duny-/Bleeding-Edge

Couple disposal fixes
Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into Defficiency