Merge pull request #40 from ZomgPonies/master

Merge From Master
Merge pull request #41 from ZomgPonies/master

Merge From Master
Poker table fix, two handed fix,  Nukeops naming

- Poker tables now actually use the poker table icon. I don't reccomend
you use this, as the poker table icon doesn't mesh well as of right now.
Plan to fix that at a later date.

- Items that require two hands now properly update when
wielded/unweilded. Hooray.

- Minor changes to the way nukeops naming works.
Merge pull request #485 from SamCroswell/master

Poker table fix, two handed fix,  Nukeops naming
Merge pull request #42 from ZomgPonies/master

Merge From Master
Janitor Rework
Oops
Merge pull request #486 from Fox-McCloud/Janitorial-Stuffs

Janitorial stuffs
Update nuclear bomb's regular and hacking UI to NanoUI
Loyalty implants for ERT
Porting over fix for HTML injection exploit from /tg/
Minor spacing fix
And cleaning up redundant definitions
Upgraded Escape and Security Podbays

Major changes to the Escape and Security podbays. Minor changes in space
around the vault. Minor change of acute treatment roller beds to beds.
Merge pull request #487 from Markolie/nanoui

Update nuclear bomb's regular and hacking UI to NanoUI
Merge pull request #43 from ZomgPonies/master

Merge From Master
PDA Fix
Merge pull request #489 from Fox-McCloud/PDA-Cart-Fix

Pda cart fix
Merge pull request #488 from fj45/master

Upgraded Escape and Security Podbays
Merge pull request #1 from ZomgPonies/master

Upstream sync