Merge pull request #117 from ZomgPonies/master

sync
Merge pull request #118 from ZomgPonies/master

Sync
supermatter drill

New traitor item
Table Climbing Block Formatting Fixes

Just a little bit of formatting improvements to the table climbing block
in case of solid object, fixes issue with having "You cannot climb a the
reinforced table," and specifies what object is in the way of climbing.
Merge remote-tracking branch 'upstream/master'
Fixes and Stuff
Merge pull request #492 from Fox-McCloud/Little-Fixes

Little fixes
Makes occupant scream while being gibbed.
Esword update
Merge remote-tracking branch 'upstream/master'
Dual Eswords Now Deflect Shots
New Coffee Cup Sprite and New Canister

-Replaces coffee cup sprite with sprite by Nienhaus
-New atmos canister with sprite by Nienhaus, white base with red
stripes, useful for making custom mixes in order to avoid carrying
around a large yellow HAZARD tank.
Add's a gibbing sound effect to the gibber. -Tigercat2000
Stop, HAMMER TIME!
Merge pull request #2 from ZomgPonies/master

Upstream merge
AI fixes, borg fixes, map fixes
Fix the incinerator doors, give atmos external airlock access so they can actually use their hardsuits (no other ways off the station)
Separate the Magistrate's Office from the IAA's Office
Add meson goggles to atmos lockers, add alert camera monitors to engineering
Solitary area fix