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

# Conflicts:
#	code/modules/admin/verbs/adminhelp.dm
#	maps/virgo-1.dmm

2017-01-21 01:42:11 -05:00

..

__defines

Polaris sync

2017-01-15 18:12:15 -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

Removes an unused gas from the code

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

controllers

Polaris sync

2017-01-15 18:12:15 -05:00

datums

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

2017-01-21 01:42:11 -05:00

defines

Polaris sync

2017-01-15 18:12:15 -05:00

game

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

2017-01-21 01:42:11 -05:00

js

…

modules

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

2017-01-21 01:42:11 -05:00

unit_tests

Permanent Revolution Update

2017-01-04 04:41:30 -05: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

Polaris sync

2017-01-15 18:12:15 -05:00

world.dm

Polaris sync

2017-01-15 18:12:15 -05:00