Leshana 4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01 ...

# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png

2018-02-01 23:55:47 -05:00

..

bluespaceartillery.dm

…

corpse.dm

POI Tweaks (#4645)

2018-01-29 23:42:57 -06:00

exile.dm

…

gateway.dm

VS: Gateway 'uncalibrated' change for no awaydests

2018-01-27 14:12:16 -05:00

loot_vr.dm

Knife path fix for VS trashpiles and a fluff item

2018-01-18 15:48:14 -05:00

loot.dm

…

pamphlet.dm

…

trigger.dm

…

zlevel.dm

Polaris sync

2017-09-15 21:17:34 -04:00