Arokha Sieyes 805b473976 Polaris Sync Merge ...

Fixed Polaris merge conflicts
* Space controller merge conflict

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

..

artifacts

Polaris sync

2017-02-01 15:08:45 -05:00

effects

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

finds

…

tools

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

2017-03-03 19:39:56 -05:00

boulder.dm

…

effect.dm

…

manuals.dm

…

master_controller.dm

…

misc_vr.dm

…

misc.dm

…

sampling.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00