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
..
2017-10-27 15:30:24 -04:00
2017-10-04 18:33:34 -05:00
2017-10-18 20:00:01 -05:00
2017-11-05 23:06:11 -06:00
2017-06-24 12:31:18 -04:00
2018-01-17 13:45:54 -06:00
2016-03-14 18:21:44 +00:00
2015-05-04 12:10:59 +03:00
2016-06-27 16:26:31 +01:00
2016-05-26 04:24:18 +01:00
2018-01-29 01:22:41 -05:00
2018-01-28 18:11:49 -08:00
2017-10-18 20:00:01 -05:00
2015-05-10 10:11:07 +03:00
2018-01-30 12:28:45 -05:00
2018-01-25 16:33:36 -05:00
2018-02-01 23:55:47 -05:00
2017-07-19 12:47:23 -05:00
2017-06-01 21:42:08 -04:00
2017-04-11 00:13:43 -04:00
2016-03-21 18:56:27 +00:00
2017-07-19 12:47:23 -05:00
2018-01-31 00:55:13 -05:00
2017-07-19 12:47:23 -05:00
2017-07-19 12:47:23 -05:00
2017-07-19 12:47:23 -05:00
2015-08-03 12:06:23 -04:00
2017-07-19 12:47:23 -05:00
2017-07-27 21:12:21 -05:00