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

..

arcade.dm

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

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

atmos_alert.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

camera.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

card.dm

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

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

communications.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

crew.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

customs.dm

…

HolodeckControl.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

law.dm

Computers are now overlay based.

2015-07-07 17:23:49 +02:00

medical.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

Operating.dm

…

power.dm

…

prisoner.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

robot.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

security.dm

Re-arranges data record and crew arrival announcement code.

2015-07-28 11:27:44 +02:00

welcome.dm

Adds variables for CentComm, NanoTrasen and the station name.

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