Arokha Sieyes a172221502 Merge pull request #2693 from blazerules/master ...

Electrostaff sheath fix

2018-01-07 21:35:13 -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

Various and sundry admin messages

2018-01-06 19:15:54 -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

Replaced world.tick_usage with TICK_USAGE macro in VOREStation code

2018-01-04 22:57:00 -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 pull request #2691 from VOREStation/vplk-fix-doors-sleeping

2018-01-06 23:07:48 -05:00

js

…

modules

Merge pull request #2693 from blazerules/master

2018-01-07 21:35:13 -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