Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm

2017-06-01 17:27:00 -04:00

..

__defines

Allow 5 traits

2017-05-29 23:29:32 -04:00

_compatibility/509

…

_helpers

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

2017-06-01 17:27:00 -04:00

_onclick

Initial implementation of holomaps!

2017-05-19 23:18:29 -04:00

ATMOSPHERICS

…

controllers

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

2017-06-01 17:27:00 -04:00

datums

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

2017-06-01 17:27:00 -04:00

defines

…

game

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

2017-06-01 17:27:00 -04:00

js

…

modules

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

2017-06-01 17:27:00 -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

Goggles are airtight

2017-05-27 03:14:14 -04:00

_macros.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

…