Merge pull request #117 from ZomgPonies/master

sync
Merge pull request #118 from ZomgPonies/master

Sync
supermatter drill

New traitor item
Makes occupant scream while being gibbed.
Revert "Merge from Master"
Merge pull request #45 from Fox-McCloud/revert-44-master

Revert "Merge from Master"
Revert "Revert "Merge from Master""
Merge pull request #46 from Fox-McCloud/revert-45-revert-44-master

Revert "Revert "Merge from Master""
Add's a gibbing sound effect to the gibber. -Tigercat2000
Merge branch 'master' of https://www.github.com/ZomgPonies/Paradise
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Merge branch 'master' of https://www.github.com/ZomgPonies/Paradise
Adds Duffelbag, Fixes Inhand for Hammers
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Changes the button for admin OOC color to be descriptive of such. "OOC
Text Color" to "Personal OOC Text Color"
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Adds Machine-People specific *buzz *ping and *beep emotes.
Fix fire alarm in engineering that gets EMP'ed
Teleporter can no longer lock on to syndicate beacons. Teleporter/beacons can be emagged to enable syndicate option.