Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 ...

# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm

2018-04-15 14:19:36 -04:00

..

legal_code_data

…

lore_data

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

lore_data_vr

Lore updates (#3430)

2018-04-14 12:58:42 -04:00

news_data

yet another lore update

2018-04-08 11:14:55 -07:00

codex_tree.dm

…

codex.dm

Lore updates (#3430)

2018-04-14 12:58:42 -04:00

pages.dm

…