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

# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme

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

..

observer_listener/atom

Ports event system from Bay

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

Processes

Merge pull request #3493 from VOREStation/just-stonedmc

2017-06-04 16:15:13 -05:00

ProcessScheduler

Ports /tg's StonedMC Subsystem from Baystation12

2017-05-30 21:00:37 -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

Antag Radio changes

2017-03-25 14:19:57 -05:00

configuration_vr.dm

Add discord integration for faxes

2016-11-04 21:58:25 -04: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

Makes red alert and evacs silence the atc

2017-03-13 07:41:10 -04:00

failsafe.dm

Ports /tg's StonedMC Subsystem from Baystation12

2017-05-30 21:00:37 -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

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

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

master.dm

Tweaks Statpanel and System Initialization

2017-06-01 21:42:08 -04:00

shuttle_controller_vr.dm

Tether Shuttle Crashing

2017-05-17 01:12:03 -04:00

shuttle_controller.dm

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

subsystem.dm

Ports /tg's StonedMC Subsystem from Baystation12

2017-05-30 21:00:37 -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

mode name and ert sechud fix

2016-08-05 16:27:07 -04:00