Merge branch 'master' into upstream-merge-26386

This commit is contained in:
LetterJay
2017-05-01 15:27:25 -05:00
committed by GitHub
267 changed files with 15247 additions and 8768 deletions
+1 -1
View File
@@ -1068,7 +1068,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/robotics/Initialize()
. = ..()
if(circuit)
circuit.name = "RD Console - Robotics (Computer Board)"
circuit.name = "R&D Console - Robotics (Computer Board)"
circuit.build_path = /obj/machinery/computer/rdconsole/robotics
/obj/machinery/computer/rdconsole/core