Another small merge fix.

This commit is contained in:
Ren Erthilo
2012-03-26 18:47:25 +01:00
parent f7e8bcd591
commit 7aa0227ef8

View File

@@ -114,7 +114,7 @@
/obj/machinery/computer/atmosphere/siphonswitch/mastersiphonswitch
name = "Master Air Control"
desc = "Emergancy global overrides for the entire atmospherics system."
/obj/machinery/computer/dna
name = "DNA operations computer"