Merge branch 'master' into upstream-merge-26129

This commit is contained in:
LetterJay
2017-04-29 11:45:37 -05:00
committed by GitHub
131 changed files with 1020 additions and 743 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/New()
..()
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