More fixes

- Charges now deplete correctly if the defib was used but failed
- All notices minus suicide notice changed to span
Merge pull request #1306 from dylanstrategie/Defib-Fix

More fixes