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

..

legal_code_data

Should fix all the corp regs & codex issues

2017-10-09 23:42:08 -04:00

lore_data

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

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

lore_data_vr

Should fix all the corp regs & codex issues

2017-10-09 23:42:08 -04:00

news_data

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

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

codex_tree.dm

Activates Neerti's Lawbook

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

codex.dm

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

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

pages.dm

Activates Neerti's Lawbook

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