Merge pull request #1790 from Citadel-Station-13/upstream-merge-28831

[MIRROR] Fix modular consoles
2017-06-27 00:27:47 -05:00
parent 3d1b8be7ce d97bb2d85d
commit 95a77e9dc1
2 changed files with 12 additions and 1 deletions
@@ -39,7 +39,7 @@

 	// Optional hardware (improves functionality, but is not critical for computer to work)

-	var/list/all_components							// List of "connection ports" in this computer and the components with which they are plugged
+	var/list/all_components = list()						// List of "connection ports" in this computer and the components with which they are plugged

 	var/list/idle_threads							// Idle programs on background. They still receive process calls but can't be interacted with.
 	var/obj/physical = null									// Object that represents our computer. It's used for Adjacent() and UI visibility checks.
@@ -0,0 +1,11 @@
+diff a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm	(rejected hunks)
+@@ -49,9 +49,6 @@
+ 	var/comp_light_color			//The color of that light
+ 
+ 
+-/obj/item/device/modular_computer/New()
+-	all_components = list()
+-	
+ /obj/item/device/modular_computer/Initialize()
+ 	. = ..()
+ 	START_PROCESSING(SSobj, src)