Torch disappearing when extinguishing fix
fix
No electricity no honking
Hotel spawn fix
Hotel blankets/pillows spawn
Fix
Hotel spawn fix 2
Merge branch 'torchfix' of https://github.com/Mshock777/Cataclysm-DDA into merge3
Merge branch 'hide-glue' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge3
Merge branch 'vehicle-fix-horn' of https://github.com/drbig/Cataclysm-DDA into merge3
Merge branch 'hotelfix' of https://github.com/Mshock777/Cataclysm-DDA into merge3
Fixed some bad copy/pasted code.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA