Revert "This is a reversal of stuff done before"

This reverts commit 33c4de15d428c84a817fddd0dd9351970a67bb65.

Conflicts:
	lib/TODO
	lib/domains/2.4.5/rooms/attic.c
	lib/domains/2.4.5/rooms/church.c
	lib/domains/2.4.5/rooms/wiz_hall.c
	lib/domains/gurba/objects/bell.c