Verkister a5ff9415fa Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm

2017-11-15 17:52:15 +02:00

..

__defines

Polaris Sync

2017-11-04 13:37:13 -04:00

_compatibility/509

…

_helpers

Pol sync part 2

2017-10-27 15:30:51 -04:00

_onclick

Pol Sync

2017-10-08 17:44:25 -04:00

ATMOSPHERICS

Polaris Sync

2017-10-16 22:16:24 -04:00

controllers

Removed a file I didn't mean to commit.

2017-11-08 08:37:16 -06:00

datums

Polaris Sync

2017-11-10 11:37:41 -05:00

defines

Polaris sync

2017-10-27 15:30:24 -04:00

game

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

2017-11-15 17:52:15 +02:00

js

…

modules

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

2017-11-15 17:52:15 +02:00

unit_tests

…

ZAS

Polaris sync

2017-10-27 15:30:24 -04:00

_macros.dm

More merging updates

2017-09-19 23:58:40 -04:00

_unit_tests.dm

…

global_vr.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Polaris sync

2017-10-27 15:30:24 -04:00

world.dm

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00