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

# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt

2018-02-21 22:19:24 -05:00

..

observer_listener/atom

Ports event system from Bay

2016-06-01 22:05:04 +01:00

Processes

Implement SSshuttles subsystem

2018-02-05 15:50:14 -05:00

ProcessScheduler

Ports https://github.com/tgstation/tgstation/pull/30184

2017-12-27 19:10:15 -05:00

subsystems

Merge branch 'master' into polaris-sync-2018-02-07

2018-02-07 23:06:03 -05:00

autotransfer.dm

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

2018-01-24 19:52:12 -05:00

communications.dm

SC Stupid Sized Map Update

2017-12-24 07:04:34 -08:00

configuration_vr.dm

Adds cap on PTO

2018-02-02 18:37:50 -05:00

configuration_yw.dm

Interserver shipping update and other changes

2017-03-03 19:13:06 -05:00

configuration.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

controller.dm

Ports /tg's StonedMC Subsystem from Baystation12

2017-05-30 21:00:37 -04:00

emergency_shuttle_controller.dm

Port's Bay's Shuttle Cleanup

2017-06-11 11:45:31 -04:00

failsafe.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

hooks-defs.dm

Adds Supply Shuttle Hook

2017-03-06 12:36:19 -05:00

hooks.dm

Fixes issues travis found

2016-03-11 11:59:51 +03:00

master_controller.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

master.dm

Preliminary implementation of ZAS as a StonedMC subsystem.

2018-01-30 12:28:45 -05:00

subsystem.dm

Bitfields do not work that way.

2018-02-05 13:13:37 -05:00

verbs.dm

Polaris sync

2017-09-15 21:17:34 -04:00

voting.dm

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

2017-06-18 15:35:35 -04:00