Neerti 35aab759be Fixes conflicts yet again.

2018-11-02 21:09:56 -04:00

..

observer_listener/atom

…

Processes

Master to AI - Reloaded (#5710)

2018-10-30 00:01:44 -07:00

ProcessScheduler

…

subsystems

Fixes conflicts yet again.

2018-11-02 21:09:56 -04:00

autotransfer.dm

Master to AI - Reloaded (#5710)

2018-10-30 00:01:44 -07:00

communications.dm

…

configuration.dm

Allows AIs to produce and control maint/construction/mining drones. (#5282)

2018-06-15 19:14:16 -05:00

controller.dm

…

emergency_shuttle_controller.dm

Converts a number of simple_animals into their simple_mob variants (#5510)

2018-08-21 18:38:18 -07:00

failsafe.dm

…

globals.dm

Still more simple_mob conversions (#5523)

2018-08-28 11:25:33 -07:00

hooks-defs.dm

…

hooks.dm

…

master_controller.dm

Still more simple_mob conversions (#5523)

2018-08-28 11:25:33 -07:00

master.dm

Still more simple_mob conversions (#5523)

2018-08-28 11:25:33 -07:00

subsystem.dm

…

verbs.dm

Master to AI - Reloaded (#5710)

2018-10-30 00:01:44 -07:00