Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

observer_listener/atom

…

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

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

2018-06-23 17:53:13 -04:00

autotransfer.dm

Fixes autotransfer message

2018-06-04 23:26:12 -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

Allows AIs to produce and control maint/construction/mining drones. (#5282)

2018-06-15 20:15:03 -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

Move planets to SSplanets

2018-06-15 19:05:38 -04:00

voting.dm

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

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