Neerti 1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles ...

# Conflicts resolved:
#	code/modules/busy_space/organizations.dm

2017-10-10 01:19:53 -04:00

..

air_traffic.dm

Makes red alert and evacs silence the atc

2017-03-13 07:41:10 -04:00

loremaster.dm

Fix runtime in air_traffic.dm due to bad organizations in loremaster.

2017-05-15 23:14:34 -04:00

organizations.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles

2017-10-10 01:19:53 -04:00