skull132 9b094ad0eb Merge branch 'upstream/development' into development ...

# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm

2016-12-18 01:06:45 +02:00

..

Processes

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

ProcessScheduler

Development Fixes - 06NOV2016 (#1120)

2016-11-06 20:14:38 +02:00

autotransfer.dm

…

communications.dm

…

configuration.dm

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

emergency_shuttle_controller.dm

Adds [dock_name] entry used by shuttles.

2016-01-14 08:33:22 +01:00

failsafe.dm

…

hooks-defs.dm

…

hooks.dm

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

master_controller.dm

Reduce more compiles

2016-11-27 18:34:26 +02:00

news_controller.dm

Generalizing establish_db_connection() and setup_database_connection()

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

shuttle_controller.dm

…

subsystems.dm

…

verbs.dm

Makes events global.

2016-01-26 13:12:37 +01:00

voting.dm

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00