More testmerge fixes

2020-07-03 15:16:02 +03:00
parent 0d9609af29
commit 6c4e733a38
8 changed files with 67 additions and 39 deletions
@@ -191,7 +191,7 @@
 	terminal = new/obj/machinery/power/terminal(T)
 	terminal.setDir(get_dir(T,src))
 	terminal.master = src
-	machine_stat &= ~BROKEN
+	stat &= ~BROKEN

 /obj/machinery/power/smes/disconnect_terminal()
 	if(terminal)