Revert "Revert "Changes to Hallway and Rooms Items implemented""

This reverts commit 6955371fd354b70ab3ad22cda1acfb5e9121a0ae.
Merge remote-tracking branch 'origin/master'

Conflicts:
	java/Weapon_LaserRifle.java