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

..

important_locations.dm

Read github PR for details.

2017-10-10 00:48:27 -04:00

main.dm

Activates Neerti's Lawbook

2017-10-03 22:29:50 -05:00

orgs.dm

Implements the new Codex.

2017-04-08 12:08:08 -04:00

political_parties.dm

Implements the new Codex.

2017-04-08 12:08:08 -04:00

species.dm

Unathi mechanical changes (#3256)

2017-04-19 13:42:51 -04:00