Added traps which can be triggered ot not while searching a room.
Merge branch 'inventory'
Merge remote-tracking branch 'origin/master' into Bas