Revert "pls merge"

Reverts Birdbrain2/Rougue#30