Always append warning flags
fix retaliation ending

relevant code was trapped in an irrelevant if()
sanity check

sanity? check.
fix battlescape button thing
ignore values over 24

i don't care if you want to make godzilla, the engine doesn't support units
over 24 voxels high. i appreciate that you modders want to push the limits,
but they're called limits for a reason.
lol
slight alteration to triscene draw method
Merge pull request #949 from AMDmi3/warnings-always

Always append warning flags
Code cleanup
Merge branch 'master' of https://github.com/SupSuper/OpenXcom
further fix for turning while dying

among other things
apply max range to psi junk
switch races for underwater misssions

hopefully the _UNDERWATER string is obscure enough to avoid causing any
compatibility issues.
fix builder error?
revert range limits on psi

requires too much effort to get it working properly, max range was never
intended to work with that anyway.
New way to control availability of items in shop

New property in item `requiresBuy` thats work similar to `requires`.
Merge remote-tracking branch 'supsuperorgin/master' into OpenXcomExtended

Conflicts:
	src/Basescape/CraftWeaponsState.cpp
	src/Battlescape/TileEngine.cpp
	src/Geoscape/DogfightState.cpp
	src/Ruleset/Armor.cpp
	src/Ruleset/RuleCraft.cpp
	src/Ruleset/RuleItem.cpp
	src/Ruleset/RuleUfo.cpp
	src/Ruleset/Ruleset.cpp
	src/Savegame/Craft.cpp