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

# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm

2017-03-13 01:29:01 -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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06

2017-03-06 20:58:38 -05: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

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

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

js

…

modules

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

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

unit_tests

…

ZAS

…

_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

…

world.dm

Merge large polaris changes

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