Arokha Sieyes 805b473976 Polaris Sync Merge ...

Fixed Polaris merge conflicts
* Space controller merge conflict

2017-03-18 00:58:12 -04:00

..

__defines

Merge pull request #3055 from VOREStation/missinghud

2017-03-06 13:51:01 -06:00

_compatibility/509

…

_helpers

New Event: Canister Leak

2017-03-09 20:05:25 -05:00

_onclick

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync

2017-03-13 01:29:01 -04:00

ATMOSPHERICS

…

controllers

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

datums

adds particle guns to science and cargo

2017-03-09 18:10:26 +00:00

defines

Improves AR glasses, makes them available

2017-03-05 20:58:59 -05:00

game

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

js

…

modules

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

unit_tests

…

ZAS

Fix rooms holding pressure when exposed to space.

2017-03-15 19:04:33 -04:00

_macros.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

Angel and Demon languages

2017-03-13 12:45:03 -04:00

world.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00