Lohikar dcf1b7d3ea Fix merge conflicts with mining changes

2017-03-22 17:54:52 -05:00

..

Processes

Merge master into map-development

2017-03-21 18:28:39 -05:00

ProcessScheduler

Development Fixes - 06NOV2016 (#1120)

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

arrival_shuttle_controller.dm

Spawning at the Odin (#1762)

2017-02-14 11:52:48 +02:00

autotransfer.dm

…

communications.dm

…

configuration.dm

Swap memos to be Discord pins instead (#1382)

2017-03-19 21:07:29 +02:00

emergency_shuttle_controller.dm

…

failsafe.dm

…

hooks-defs.dm

…

hooks.dm

…

law.dm

Shredder Movement & Law Controller (#1700)

2017-02-04 00:15:49 +02:00

master_controller.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

shuttle_controller.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

subsystems.dm

…

verbs.dm

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

voting.dm

Fix voting

2017-03-19 22:36:34 +02:00