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

# Conflicts:
#	code/modules/mob/language/station_vr.dm

2016-12-18 00:56:03 -05:00

..

__defines

Polaris December Sync

2016-12-10 09:51:11 -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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -04:00

ATMOSPHERICS

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

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

controllers

Add discord integration for faxes

2016-11-04 21:58:25 -04:00

datums

Polaris December Sync

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

defines

Omnihud glasses

2016-10-22 18:14:27 -04:00

game

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

2016-12-18 00:56:03 -05:00

js

…

modules

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

2016-12-18 00:56:03 -05:00

unit_tests

Unit test fix

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

ZAS

…

_macros.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

_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

Revert "Revert "Revert "Revert "Revert "Revert "Adds hub passwordu""""""

2016-10-07 21:15:43 -04:00

names.dm

…

stylesheet.dm

…

world.dm

Polaris December Sync

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