Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

2018-01-19 17:52:25 -05:00

..

__defines

Speedup Travis and Upgrade Byond used by Travis

2018-01-17 19:23:35 -05:00

_compatibility/509

…

_helpers

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

2018-01-19 17:52:25 -05:00

_onclick

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

ATMOSPHERICS

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

controllers

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

2018-01-19 17:52:25 -05:00

datums

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

2018-01-19 17:52:25 -05:00

defines

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

2018-01-19 17:52:25 -05:00

game

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

2018-01-19 17:52:25 -05:00

js

…

modules

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

2018-01-19 17:52:25 -05:00

unit_tests

Move unit test except areas into tether_defines where they should be.

2018-01-17 00:31:02 -05:00

ZAS

Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing"""""""""

2018-01-16 17:35:43 -06:00

_macros.dm

Multiple loadout slots (#4530)

2018-01-14 14:47:47 -06:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

New Science Dogborg

2018-01-07 00:05:10 -05:00

global.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00