Leshana 4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24 ...

# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm

2018-02-24 13:19:10 -05:00

..

__defines

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

2018-02-23 21:55:42 -05:00

_compatibility/509

…

_helpers

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

2018-02-23 21:55:42 -05:00

_onclick

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

2018-02-23 21:55:42 -05:00

ATMOSPHERICS

Consolidated digital t-valves type paths.

2018-02-22 15:11:55 -05:00

controllers

POLARIS?: Attempt to find the source of qdel'd images

2018-02-20 10:00:48 -05:00

datums

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

2018-02-23 21:55:42 -05:00

defines

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

game

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

2018-02-24 13:19:10 -05:00

js

…

modules

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

2018-02-24 13:19:10 -05:00

unit_tests

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00

ZAS

Convert ZAS "Airflow" into a subsystem plus fixes

2018-01-30 12:28:45 -05:00

_away_mission_tests.dm

Make Travis run a build matrix, add new test

2018-01-27 15:17:26 -05:00

_macros.dm

Multiple loadout slots (#4530)

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

_map_tests.dm

Allows Travis to Validate PoI Maps

2017-11-19 06:07:41 -05:00

_unit_tests.dm

…

global_vr.dm

New Science Dogborg

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

global.dm

Initial cleanup/changes

2018-02-17 19:47:39 -06:00

hub.dm

…

names.dm

…

stylesheet.dm

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

2017-12-26 23:07:58 -05:00

world.dm

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00