Leshana 7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm

2017-04-15 23:14:32 -05:00

..

__defines

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

_compatibility/509

…

_helpers

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

_onclick

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

2017-04-01 19:19:42 -04:00

ATMOSPHERICS

Fixes scrubber Phoron scrubbing

2017-04-13 22:32:40 +01:00

controllers

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

datums

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

2017-04-10 20:41:18 -04:00

defines

Merge pull request #1343 from VOREStation/aro-sync

2017-04-04 20:52:03 -04:00

game

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

js

…

modules

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

unit_tests

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

ZAS

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

2017-03-24 16:35:31 -05:00

_macros.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Fixes a bug with some languages

2017-03-31 17:52:15 +01:00

world.dm

…