Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme

2018-01-27 23:08:53 -05:00

..

important_locations.dm

Polaris Sync

2017-10-16 22:16:24 -04:00

main.dm

adds an e-reader full of news to the loadout (#4619)

2018-01-25 18:18:35 -06:00

orgs.dm

…

political_parties.dm

…

species.dm

Adds the Promethean loreblurb

2017-10-22 19:14:34 -05:00