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

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

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

..

observer_listener/atom

…

Processes

Polaris sync

2017-12-21 04:01:07 -05:00

ProcessScheduler

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

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

subsystems

Add checks to allow Tesla to fully dissipate once it runs out of energy.

2018-01-21 16:19:13 -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

Fix ratio join bug

2018-01-21 23:49:13 -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

…

master_controller.dm

Print world atom/object initialization progress to world.log to compare against subsystem initialization.

2018-01-22 19:23:10 -05:00

master.dm

Ports /tg controller optimizations

2017-12-27 21:19:55 -05:00

shuttle_controller.dm

Web Shuttle Update

2018-01-14 14:03:58 -05:00

subsystem.dm

Ports /tg controller optimizations

2017-12-27 21:19:55 -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