fucked up manual merges. forgive me.

Revert "https://github.com/rmmh/PuzzleScript/commit/ff4df364e2b9aadcc7a16fc70a4d04830f44a329"

This reverts commit dbeaa869f34773808cd327d2b764d4f79ac3ab56.
fucked up manual merges. forgive me.
Revert "https://github.com/rmmh/PuzzleScript/commit/932642f55871ef2871e6694ca197e614bb812839"

This reverts commit d2bed6a8616f87666e42914560ac2952bfd8cb2b.