Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'master' of https://github.com/jamiedigweed/NSS-Phoenix
Merge branch 'master' of https://github.com/jamiedigweed/NSS-Phoenix
Dev rank, devsay and bandanas for people on start.
Added Logo to Splash screen
Removed some emergency lights
Merge branch 'master' of https://github.com/jamiedigweed/NSS-Phoenix
Merge pull request #143 from jamiedigweed/Jamie

Jamie
Colours for Kal
Merge pull request #14 from jamiedigweed/master

Update to latest
No more IPC Changelings
Fix shutter logs toggle

Also, caps fix, because I'm a picky bastard...
What the? I don't even

I have no idea why these are here, they are defined a few lines up and
these defines are breaking shit
Mute OOC turns off your radio...
Merge pull request #144 from jamiedigweed/Jamie

Colours for Kal
Merge pull request #146 from Maxis010/shutters

Fix shutter logs toggle
Merge pull request #147 from Maxis010/oocradio

Oocradio
Merge pull request #145 from Maxis010/changeling

No more IPC Changelings
Merge branch 'master' of https://github.com/jamiedigweed/NSS-Phoenix
Merge pull request #7 from jamiedigweed/master

master merge
Merge pull request #148 from jamiedigweed/master

Update to current