Arokha Sieyes 0a037f0fe0 Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10 ...

Polaris Sync 2018 01 10

2018-01-16 02:46:25 -05:00

..

__defines

Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10

2018-01-15 13:27:39 -05:00

_compatibility/509

…

_helpers

POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

2018-01-14 23:00:10 -05:00

_onclick

POLARIS: The return of the material scanner overlay

2018-01-14 19:26:54 -05:00

ATMOSPHERICS

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

2018-01-09 14:40:09 -05:00

controllers

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

2018-01-09 14:40:09 -05:00

datums

Refactor Digestion

2018-01-10 02:06:13 -05:00

defines

VS: Planes shenanigans. Begins 'plane' work, for VS specific things.

2018-01-14 00:40:00 -05:00

game

Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10

2018-01-16 02:46:25 -05:00

js

…

modules

Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10

2018-01-16 02:46:25 -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

New Science Dogborg

2018-01-07 00:05:10 -05:00

global.dm

POLARIS: Planes shenanigans. Begins 'plane' work.

2018-01-14 00:39:59 -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