Conflict fix?
Merge remote-tracking branch 'upstream/dev' into dev
Conflict fix. Again.
Removed the (empty) medkits from ERT backpacks
Camera mapping.
Robotic cameras.
Robotic cameras again.
Camera networks.
Alarm cameras.
Merge pull request #3371 from Kilakk/dev

Fixes #3368 - Removed the (empty) medkits from ERT backpacks
Cameras for strike teams.
Changelog.
Merge pull request #3372 from Segrain/dev

Cameras update.
Adds a vox heist game mode. Fairly complex.
Adjustments to vox shuttle areas and shuttle contents.
Added BE_RAIDER pref to player setup and adjusted vox min player counts away from local testing values.
Merged setup.dm.
Manual map merge.
Merge pull request #3370 from Zuhayr/feature

Heist mode addition.
Added a deadchat toggle for all players.

* Both admins and regular players can toggle deadchat off
* Having deadchat on still requires you to be a ghost or an admin/mod to be able to /see/ deadchat