skull132 8b5c7bc2c5 Conflict resolution ...

Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt

2016-03-25 22:25:41 +02:00

..

Processes

Merge remote-tracking branch 'Aurorastation/development' into new-engine

2016-01-24 23:25:08 +02:00

ProcessScheduler

Processor status text clarification

2016-03-25 02:08:08 +02:00

subsystem

…

autotransfer.dm

…

communications.dm

Makes the private AI channel truly private.

2015-08-16 15:43:28 +02:00

configuration.dm

Conflict resolution

2016-03-25 22:25:41 +02:00

emergency_shuttle_controller.dm

Fixes #11022

2015-09-07 14:25:45 +09:30

failsafe.dm

…

hooks-defs.dm

…

hooks.dm

…

master_controller.dm

Makes the new initialization message use the proper method.

2015-08-10 17:46:38 +02:00

news_controller.dm

Generalizing establish_db_connection() and setup_database_connection()

2016-03-04 00:53:37 +02:00

shuttle_controller.dm

Fixes #10723

2015-08-18 10:28:06 -04:00

subsystems.dm

…

verbs.dm

…

voting.dm

Voting Overhaul

2016-03-25 16:09:03 +02:00