Fixes #6871. Fixes #6821.

Amended to match the formatting in #6846, to hopefully avoid merge issues.
Adds sanity check for the mecha fire extingusher as well. Would rather remake it to be based on the standard extinguisher code but that's a dev project.
Merge pull request #6873 from PsiOmegaDelta/Extinguish

Fixes #6871