Arokha Sieyes 2ad006c3b2 Merge pull request #2652 from VOREStation/Cameron653-patch-3 ...

Swaps two words around.

2018-01-02 02:45:28 -05:00

..

__defines

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

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

_compatibility/509

…

_helpers

Minor fixes to Polaris Merge

2017-12-23 21:54:07 -05:00

_onclick

Polaris sync

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

ATMOSPHERICS

Merge branch 'master' into algaegen

2017-12-01 19:14:56 -05:00

controllers

Clarify extend vote wording

2017-12-27 18:19:18 -05:00

datums

ALL hunter ammo commented out

2017-12-23 21:40:56 -05:00

defines

Clean up shuttle references

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

game

Bodysnatcher message tweak.

2017-12-29 15:39:42 +02:00

js

…

modules

Merge pull request #2652 from VOREStation/Cameron653-patch-3

2018-01-02 02:45:28 -05:00

unit_tests

Polaris sync

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

ZAS

Polaris sync

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

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

…

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

…