Arokha Sieyes b76a3c7f5b Merge pull request #2796 from Cyantime/hypo ...

Removes redundant hypospray

2018-01-20 22:46:20 -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

Update VOREStation specific code to use merged in features.

2018-01-19 18:15:47 -05:00

ATMOSPHERICS

Fix construction of HE pipes, Vents, and Scrubbers Plus qdel issues.

2018-01-19 23:21:55 -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

Compensated for addition of Planetary Department to PDAs.

2018-01-19 21:09:02 -05:00

game

Merge branch 'master' into hypo

2018-01-20 01:39:16 -05:00

js

…

modules

Merge branch 'master' into hypo

2018-01-20 01:39:16 -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

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

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

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