Merge pull request #5 from UristMcStation/master

merge
derp
Revert "derp"

This reverts commit 4161cf910cab2f2da117ff0adbc8ea5ad561d39c.
darn guy
Revert "darn guy"

This reverts commit 054bbd168cf7d6ab5c8598c022c4c3a8569e6f6f.
Merge pull request #6 from UristMcStation/master

Meh?
Fixes bad entry in rig/sprite_sheets_obj
Merge pull request #5908 from mwerezak/fix

Fixes bad entry in rig/sprite_sheets_obj
Fixes icon not reverting when cycling a suit back
Fixes yank out object bloodying the wrong hands
Fixes xbow tension not being rest when fired
fixes #5914

user message blatantly stolen from /tg/ <3
Roboticist character set up fix
Revert "Roboticist character set up fix"

This reverts commit 5152b7aaa0941218a9673ee0ebe49717fe059936.
Fix the fix
Merge pull request #5916 from Walter0o/patch-2

fixes #5914
Merge pull request #5917 from mwerezak/fix

Some fixes
Adds tear gas.
Merge pull request #43 from TGameCo/robo-preview-fix

Robo preview fix
Merge pull request #44 from JacobLee1/cry_your_eyes_out_greytide

Adds tear gas.