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

..

browser

Activates Neerti's Lawbook

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

changelogs

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

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

images

Implements the new Codex.

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

templates

…

88x31.png

…

archivedchangelog.html

…

bug-minus.png

…

burn-exclamation.png

…

changelog.css

…

changelog.html

Updates changelog

2018-01-12 15:56:14 -08:00

changelog.js

…

chevron-expand.png

…

chevron.png

…

create_object.html

…

cross-circle.png

…

hard-hat-exclamation.png

…

image-minus.png

…

image-plus.png

…

map-pencil.png

…

music-minus.png

…

music-plus.png

…

panels.css

…

search.js

…

spell-check.png

…

tick-circle.png

…

wrench-screwdriver.png

…