Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 ...

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

..

__defines

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

_compatibility/509

…

_helpers

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

_onclick

Polaris sync

2017-12-21 04:01:07 -05:00

ATMOSPHERICS

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

controllers

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

datums

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

defines

Clean up shuttle references

2017-11-28 13:54:31 -05:00

game

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

js

…

modules

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

unit_tests

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

ZAS

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

_macros.dm

Ports hoists, as well as some macros, from Aurorastation. (#4451)

2018-01-01 12:17:35 -08:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

2017-12-26 23:07:58 -05:00

world.dm

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00