Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

__defines

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

2016-11-04 15:42:32 -04:00

_compatibility/509

…

_helpers

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

2016-11-04 15:42:32 -04:00

_onclick

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

2016-11-04 15:42:32 -04:00

ATMOSPHERICS

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

controllers

Try to fix microBgone bug

2016-10-22 22:27:45 -04:00

datums

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

2016-11-04 15:42:32 -04:00

defines

Omnihud glasses

2016-10-22 18:14:27 -04:00

game

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

2016-11-04 15:42:32 -04:00

js

…

modules

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

2016-11-04 15:42:32 -04:00

unit_tests

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

ZAS

…

_macros.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

_unit_tests.dm

…

global_vr.dm

…

global.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

hub.dm

Revert "Revert "Revert "Revert "Revert "Revert "Adds hub passwordu""""""

2016-10-07 21:15:43 -04:00

names.dm

…

stylesheet.dm

…

world.dm

…