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

# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt
#	maps/tether/tether-03-station.dmm
#	vorestation.dme

2017-09-03 12:49:08 -04:00

..

__defines

Polaris sync

2017-08-06 19:07:17 -04:00

_compatibility/509

…

_helpers

Configurable mob spawners, re-implementation of trash mouse spawning.

2017-08-15 22:09:53 -04:00

_onclick

Polaris sync

2017-08-06 19:07:17 -04:00

ATMOSPHERICS

Polaris Sync

2017-08-28 20:52:11 -04:00

controllers

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

2017-09-03 12:49:08 -04:00

datums

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

2017-09-03 12:49:08 -04:00

defines

Polaris Sync

2017-08-28 20:52:11 -04:00

game

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

2017-09-03 12:49:08 -04:00

js

…

modules

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

2017-09-03 12:49:08 -04:00

unit_tests

Polaris sync

2017-08-06 19:07:17 -04:00

ZAS

…

_macros.dm

Comms can speak EAL

2017-07-24 20:45:41 -05:00

_unit_tests.dm

…

global_vr.dm

…

global_yw.dm

Added back crowbars to Medihound, Added defibs to medhound, changed beaker to a large one.

2017-08-29 03:15:28 +01:00

global.dm

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

2017-07-20 15:50:53 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

…