Merge pull request #1 from ZomgPonies/master

Tring to merge downstream
Goon-style fabricators MAP CHANGES
Altered disarm knockdown

now only occurs with a 30% chance if you already have an aggressive grab
(or better) on the target.

No more disarm > stun baton.
T-Ray scanner var improvement

Allows tray scanner range and pulse duration to be controlled by vars.
Added three upgraded tray scanners, with increased range, increased
pulse duration, and both of these features.
Genetics fixes

Fixes issue with getting target in remote talk, remote view and empath
Fixes Empath  not recharging
Fixes inability to cancel remote view
Fixes Grays not starting with remote talk
Adds a sound when nations mode is announced

Not tested because I can't force nations without server pop.
Merge pull request #385 from iamgoofballsecondfork/wegoonnow

Goon-style fabricators MAP CHANGES
Merge pull request #387 from IndexLP/master

Fixes and updates for the berets
Merge pull request #388 from Bone-White/master

Altered disarm knockdown …
Map fixes and changes

CC Experimentation area.
-ERT Debriefing area.
-ERT Temporary Holding area.
-CC Carpet Fixes
-CC Access Fixes
-CC simulated tiles fixed
-Replaced Secure Armory crates by Gun Cabinets (EMPTY)
-Added atmospherics tech (LSS) lockers.
-Added emergency medical vendors in Engi and Sec.
-Numerous scrubbers/vent fixes
-Wiring fixes
-CC Cyborg Area (Fluff)
-More fixes (Too much to be listed as it is)
-AI chamber bigger, with an additional turret and additional
wall-mounted flashes.
-Moved AI turrets for bigger coverage and harder destruction.
-Emergency AI Maintenance button in the captain's office. Open the AI's
blast door. Captain-level access required.
-Kitchen Shutters from Kitchen to bar,
-Linked clown office to maintenance (POWER GRID)
-Made Secure Storage (ENGINEERING) Bigger. Added in the spare
engineering pipe dispensers.
-Added an extra APC and removed garbage wiring to hopefully fix emitters
running out.
Use absolute paths next time
MySQL fixes
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Merge pull request #389 from W3bster/master

Map fixes and changes
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Removed two debug comments
Merge pull request #390 from Bone-White/master

Removed two debug comments
Fixed the font tag on mouse traps description.

Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
Fix for bloody hands yanking shit
Fixes xbow tension not being rest when fired