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

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

observer_listener/atom

Ports event system from Bay

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

Processes

Planet controller startup delay

2018-06-02 11:06:53 -04:00

ProcessScheduler

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

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

subsystems

Split and clarify global lists of processing vs non-processing machinery. (#5307)

2018-05-28 15:57:02 -04:00

autotransfer.dm

Fixing votes

2018-03-16 17:46:22 -04: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 branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

controller.dm

Ports /tg's StonedMC Subsystem from Baystation12

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

emergency_shuttle_controller.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

failsafe.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

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

globals.dm

Implemented basic GLOB and TGS3's DMAPI

2018-02-27 18:31:13 -05:00

hooks-defs.dm

Adds Supply Shuttle Hook

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

hooks.dm

…

master_controller.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

master.dm

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

2018-04-27 21:45:13 -04:00

subsystem.dm

Merge pull request #5200 from VOREStation/vplk-stonedmc-sync

2018-04-24 15:20:57 -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