Gives the R&D Server a description and makes its name improper

2017-11-21 19:43:29 -05:00
parent dbf2467f5e
commit 61ae95da33
1 changed files with 6 additions and 0 deletions
@@ -1,5 +1,11 @@
+<<<<<<< HEAD
 /obj/machinery/r_n_d/server
 	name = "R&D Server"
+=======
+/obj/machinery/rnd/server
+	name = "\improper R&D Server"
+	desc = "A computer system running a deep neural network that processes arbitrary information to produce data useable in the development of new technologies. In layman's terms, it makes research points."
+>>>>>>> 5d9231a... Gives the R&D Server a description and makes its name improper (#32955)
 	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "server"
 	var/datum/research/files