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

# Conflicts:
#	config/custom_items.txt
#	maps/virgo-1.dmm
#	maps/virgo-2.dmm

2017-01-04 14:05:08 -05:00

..

__defines

Polaris sync

2016-12-27 08:21:55 -05:00

_compatibility/509

…

_helpers

Nerfed hyperzine, added more languages to borgs understanding, boosted the ERT borg's gun, added new dogborg, fixed xenomaid borg so it is selectable, other..

2016-11-27 17:33:53 -05:00

_onclick

…

ATMOSPHERICS

De-cluttered Atmospherics, enabled air vent direction switching, and added digital valve un-wrenching.

2016-12-07 21:50:26 +00:00

controllers

…

datums

Made a dmi and a dm file for the german uniforms and maybe russian ones in the future and fixed wedding rings coverage and added mateba and derringer to the crate

2016-12-30 12:14:27 +01:00

defines

…

game

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

2017-01-04 14:05:08 -05:00

js

…

modules

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

2017-01-04 14:05:08 -05:00

unit_tests

Unit test fix

2016-11-18 23:41:38 -06:00

ZAS

…

_macros.dm

…

_unit_tests.dm

…

global_vr.dm

…

global_yw.dm

Nerfed hyperzine, added more languages to borgs understanding, boosted the ERT borg's gun, added new dogborg, fixed xenomaid borg so it is selectable, other..

2016-11-27 17:33:53 -05:00

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

…

world.dm

Polaris December Sync

2016-12-10 09:51:11 -05:00