Efficiency 1.23d

Improved the firelock layout a bit in the hallways
Removed the magical SMES cells
Merge pull request #1532 from Duny-/Defficiency

Efficiency 1.23d