cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
This commit is contained in:
PsiOmega
2015-08-21 20:27:48 +02:00
parent 55d1bbf735 4396e5a5bc
commit e48fbdd1e6
118 changed files with 441 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/research.dm
View File

@@ -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

2
code/modules/research/server.dm
View File

@@ -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()