Merge pull request #1 from HypatiaStation/master

merge 1
Merge pull request #2 from HypatiaStation/master

Merge#2 ignore
Merge pull request #3 from HypatiaStation/master

Update mah code pls.
Merge pull request #4 from HypatiaStation/master

Updates my code
Merge pull request #5 from HypatiaStation/master

Updates me
Merge pull request #6 from HypatiaStation/master

IGNORE
Merge pull request #7 from HypatiaStation/master

ignore this
Merge pull request #8 from HypatiaStation/master

Baystation sync as of 27th November 2014
Fixes a really small issue, brings back taking the sheets out of windows.
Revert "Fixes a really small issue, brings back taking the sheets out of windows."

This reverts commit f17f01d29d14993479ca3abdd816414a9f453976.
Merge pull request #9 from HypatiaStation/master

s
Fixes Donor stuff
Fixes #238
Fixes #245
Alternate PDAs

Restores the alternative PDA icons
Merge pull request #254 from Dalekfodder/master

A couple of fixes.
Custom Items

Custom items for bitflimsy, fatal, cascade, derp, serendip, vexif,
crystal, goragh, nite and bean.
Merge pull request #255 from GameMaster85/master

Adding Bureaucratic Templates to Photocopier
Custom items update

Icon for a custom item
Merge pull request #1 from HypatiaStation/master

Merging to GameMaster/HypatiaStation...