Fix windows build maybe.
Revert "Reverts BOOTS use_action on rubber boots."

This reverts commit 73b9ea07ab70abd03b3fd4978476c1cbc745a014.
comma and bracket

Missed the comma, thought the bracket needed to be removed :)
Merge branch 'pr/4373'
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
[BUGFIX]: labs, bunkers, etc: overmap::ter; don't return ot_null directly for invalid coords.
[BUGFIX]: labs, bunkers, etc: overmap::ter; don't return ot_null directly for invalid coords.
extra paranoia; reset overmap::nullret to 0
CBM: Radiation Scrubber System

Removes rads at the cost of bionic power.
Merge stylish trait description tweak.
Merge go-bag duplicate rollmat fix.
Merge bio rad scrubber and counter.
editmap: fix mapgen positioning
editmap: fix mapgen positioning
"staircase fix" + compensation for mapgen behavior change in d2dafffc
Merge mi-go/doll speech refactor.

Conflicts:
	CataclysmWin.cbp
Merge game pointer decimation.

Conflicts:
	src/monattack.cpp
	src/monattack.h
Merge some more renaming.
Merge profession skill/addiction display.
Merge removal of hardcoded pocketknife and matches.
Merge item highlights for tiles mode.