Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747

[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
2017-08-21 20:32:10 -05:00
parent 91fc414b20 a6eb648f96
commit f2f1474123
136 changed files with 1993 additions and 2195 deletions
@@ -262,14 +262,14 @@ Difficulty: Very Hard
 		return FALSE
 	return TRUE

-/obj/machinery/smartfridge/black_box/New()
+/obj/machinery/smartfridge/black_box/Initialize()
+	. = ..()
 	var/static/obj/machinery/smartfridge/black_box/current
 	if(current && current != src)
 		qdel(src, force=TRUE)
 		return
 	current = src
 	ReadMemory()
-	. = ..()

 /obj/machinery/smartfridge/black_box/process()
 	..()