Added spawns to hotel toilets, tweaked mapgen a bit
Merge a map edit fix.
Merge branch 'chase-vehi-pg' of https://github.com/Chase-san/Cataclysm-DDA into Chase-san-chase-vehi-pg
Merge branch 'mod-man-2' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-mod-man-2
Merge branch 'smooth-view-shift' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-smooth-view-shift
Merge pull request #6038 from MisterFelixFox/fish-hook-icon-fix

Change fishing hook icon from J to ,
Merge pull request #6036 from BevapDin/drop-empty-container-fix

clear auto-dropping empty food containers and change to use position
Merge limiter to automatic view shifting when driving.

Conflicts:
	src/game.cpp
Make a helper function officially static.
Merge pull request #6040 from doublej472/spelling-fix

Fixed spelling error in main.cpp
Dino spawn tweaks and range damage buff