PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

Processes

Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums

2015-08-20 14:16:35 +02:00

ProcessScheduler

…

subsystem

…

autotransfer.dm

…

communications.dm

Makes the private AI channel truly private.

2015-08-16 15:43:28 +02:00

configuration.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

emergency_shuttle_controller.dm

…

failsafe.dm

…

hooks-defs.dm

…

hooks.dm

…

master_controller.dm

Adds missing closing quote.

2015-08-10 18:10:53 +02:00

shuttle_controller.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

subsystems.dm

…

verbs.dm

…

voting.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00