Tigercat2000 356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm

2015-12-03 11:03:01 -08:00

..

Processes

tgshuttles unfinished

2015-12-03 10:59:06 -08: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

Add config option to disable same-CID popup "YOU'LL BE BANNED STOP IT"

2015-11-01 20:34:37 -08:00

emergency_shuttle_controller.dm

Add shuttle call reason

2015-08-14 21:18:51 +02: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

shuttle_controller.dm

Update shuttle_controller.dm

2015-08-18 22:04:27 -04:00

verbs.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

voting.dm

Crew Transfer No Longer Blocked by Security Level

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