Leshana 69a50ec225 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609 ...

# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme

2017-06-09 22:54:16 -04:00

..

__defines

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

2017-06-09 22:54:16 -04:00

_compatibility/509

…

_helpers

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

2017-06-09 22:54:16 -04:00

_onclick

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

2017-06-09 22:54:16 -04:00

ATMOSPHERICS

Puts 3x more gas in pressure tanks

2017-06-08 20:39:07 +01:00

controllers

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

2017-06-09 22:54:16 -04:00

datums

Fix issues with radiation controller on multi-z maps.

2017-06-02 12:46:03 -04:00

defines

…

game

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

2017-06-09 22:54:16 -04:00

js

…

modules

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

2017-06-09 22:54:16 -04:00

unit_tests

Exclude certain areas from unit tests appliciable to the new Tether map.

2017-05-20 16:57:35 -04:00

ZAS

Additional Work on NIFs

2017-06-06 01:00:46 -04:00

_macros.dm

Adds macros to assist with lazily instantiating lists.

2017-06-08 17:20:44 -04:00

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

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

2017-06-09 22:54:16 -04:00