tgstation/-tg-station — pull request #5053 by paprka (2014-10-02 03:19:26+00:00)
Title: SYNDICATE SHOTGUNS: WORKING PR AND NO CONFLICTS EDITION

MERGE THIS