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
elgeonmb
3d5740c909
adds an e-reader full of news to the loadout ( #4619 )
...
* adds an e-reader full of news to the loadout
* Political Almanac -> Pocket Newscaster
2018-01-25 18:18:35 -06:00
killer653
fa1170c7e8
Should fix all the corp regs & codex issues
2017-10-09 23:42:08 -04:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Anewbe
0de6cddef5
Activates Neerti's Lawbook
2017-10-03 22:29:50 -05:00
Arokha Sieyes
6a98b982a7
Update Codex to have our lore
...
Updates the lore in the Codex books to be accurate to our lore, and invented a bunch of extra lore on the spot to make it make sense. Seems fine to meeeeeeee.
2017-04-25 18:59:05 -04:00
Neerti
a4a05ae4ec
Implements the new Codex.
2017-04-08 12:08:08 -04:00
