Kelshark 5b6c8aeab6 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/clothing/under/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	config/custom_items.txt

2017-02-12 00:32:26 -05:00

..

__defines

Polaris sync

2017-02-01 15:08:45 -05:00

_compatibility/509

…

_helpers

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-02-12 00:32:26 -05:00

_onclick

Polaris sync

2017-02-01 15:08:45 -05:00

ATMOSPHERICS

Removes an unused gas from the code

2017-01-02 18:41:05 -05:00

controllers

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-02-12 00:32:26 -05:00

datums

Proof of concept shipping API

2017-02-12 00:29:57 -05:00

defines

Polaris sync

2017-02-01 15:08:45 -05:00

game

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-02-12 00:32:26 -05:00

js

…

modules

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-02-12 00:32:26 -05:00

unit_tests

Does tons of stuff, see PR for details.

2017-01-25 19:31:21 -05:00

ZAS

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

_macros.dm

…

_unit_tests.dm

…

global_vr.dm

…

global_yw.dm

…

global.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2016-12-11 13:41:38 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

For some reason this didn't get pushed

2017-02-01 15:11:06 -05:00

world.dm

Proof of concept shipping API

2017-02-12 00:29:57 -05:00