Merge branch 'dev' into ofMechfabAndPanic

Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm

code/modules/research/research.dm

@@ -180,7 +180,7 @@ research holder datum.
 
 /datum/tech/syndicate
 	name = "Illegal Technologies Research"
-	desc = "The study of technologies that violate standard Nanotrasen regulations."
+	desc = "The study of technologies that violate standard government regulations."
 	id = TECH_ILLEGAL
 	level = 0
 

code/modules/research/server.dm

@@ -124,7 +124,7 @@
 		return
 
 /obj/machinery/r_n_d/server/centcom
-	name = "Centcom Central R&D Database"
+	name = "Central R&D Database"
 	server_id = -1
 
 /obj/machinery/r_n_d/server/centcom/initialize()