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

..

combat.dm

Merge resolution.

2015-06-28 06:13:24 +09:30

durand.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

gygax.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

marauder.dm

Updates files as necessary to adhere to the new standard.

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

phazon.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00