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

# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt

2017-10-29 18:14:56 -04:00

..

observer_listener/atom

Ports event system from Bay

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

Processes

Pol Sync

2017-10-08 17:44:25 -04:00

ProcessScheduler

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

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

subsystems

Fixes initial nif backups and adds a flashlight nifsoft.

2017-10-23 16:26:36 +03:00

autotransfer.dm

Update autotransfer.dm

2017-08-28 17:09:41 -04:00

communications.dm

Fixes all the other stuff

2017-10-15 20:56:13 -04:00

configuration_vr.dm

Add discord integration for faxes

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

configuration_yw.dm

Interserver shipping update and other changes

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

configuration.dm

Polaris sync

2017-10-27 15:30:24 -04: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

Rough port of

2017-08-21 14:44:25 -07:00

master.dm

Port's TG's Maploader

2017-09-08 12:49:26 -04:00

shuttle_controller.dm

Makes Arrivals Shuttle Great

2017-08-05 15:18:55 -04:00

subsystem.dm

Standardize MC subsystem initialization boilerplate

2017-06-10 22:41:51 -04: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