Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

Processes

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

ProcessScheduler

Make DI tab readable

2015-09-20 10:53:37 -07:00

communications.dm

Port Bay's intercom overhaul

2015-09-03 21:21:20 +02:00

configuration.dm

send2irc Multi-Host upgrade

2016-02-11 11:24:30 -08:00

failsafe.dm

Alarm system overhaul

2015-08-02 07:13:03 +02:00

hooks-defs.dm

Display case update, some forceMove updates

2015-09-14 20:21:56 +02:00

hooks.dm

Mutiny Mode

2014-05-15 01:01:54 -04:00

master_controller.dm

Various fixes

2015-09-26 04:51:36 +02:00

verbs.dm

Supply shuttle, initial_move() fixes, dock fixes

2015-12-04 21:48:40 -08:00

voting.dm

Crew Transfer No Longer Blocked by Security Level

2015-11-18 00:10:07 -05:00