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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether_defines.dm

2017-07-20 15:50:53 -04:00

..

observer_listener/atom

Ports event system from Bay

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

Processes

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630

2017-06-30 22:31:43 -04:00

ProcessScheduler

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

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

subsystems

Converts the lighting process controller to a StonedMC subsystem

2017-06-16 23:08:41 -04:00

autotransfer.dm

Round start timer now remains at 0 until the round actually starts.

2016-04-20 15:27:59 +01:00

communications.dm

More and more Destroy() cleanups all across the board - Return qdel hints.

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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609

2017-06-09 22:54:16 -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

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

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

master.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

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

shuttle_controller.dm

Port's Bay's Shuttle Cleanup

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

subsystem.dm

Standardize MC subsystem initialization boilerplate

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

verbs.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609

2017-06-09 22:54:16 -04:00

voting.dm

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

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