From 2f7551cfe1415e4937d4b7128e630c4e96c456f7 Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexisentertainment@gmail.com>
Date: Thu, 19 Dec 2013 12:03:23 -0800
Subject: [PATCH] Now it's fixed.

---
 code/game/dna/dna_modifier.dm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 00dfa0f898d..10379c6d247 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -19,17 +19,18 @@
 
 /datum/dna2/record/proc/GetData()
 	var/list/ser=list("data" = null, "owner" = null, "label" = null, "type" = null, "ue" = 0)
-	ser["ue"] = (types & DNA2_BUF_UE) == DNA2_BUF_UE
-	if(types & DNA2_BUF_SE)
-		ser["data"] = dna.SE
-	else
-		ser["data"] = dna.UI
-	ser["owner"] = src.dna.real_name
-	ser["label"] = name
-	if(types & DNA2_BUF_UI)
-		ser["type"] = "ui"
-	else
-		ser["type"] = "se"
+	if(dna)
+		ser["ue"] = (types & DNA2_BUF_UE) == DNA2_BUF_UE
+		if(types & DNA2_BUF_SE)
+			ser["data"] = dna.SE
+		else
+			ser["data"] = dna.UI
+		ser["owner"] = src.dna.real_name
+		ser["label"] = name
+		if(types & DNA2_BUF_UI)
+			ser["type"] = "ui"
+		else
+			ser["type"] = "se"
 	return ser
 
 /////////////////////////// DNA MACHINES
@@ -316,6 +317,8 @@
 
 /obj/machinery/computer/scan_consolenew/New()
 	..()
+	for(var/i=0;i<3;i++)
+		buffers[i+1]=new /datum/dna2/record
 	spawn(5)
 		for(dir in list(NORTH,EAST,SOUTH,WEST))
 			connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
@@ -404,8 +407,8 @@
 	data["disk"] = diskData
 
 	var/list/new_buffers = list()
-	for(var/datum/dna2/record/buf in buffers)
-		new_buffers.Add(list(buf.GetData()))
+	for(var/datum/dna2/record/buf in src.buffers)
+		new_buffers += list(buf.GetData())
 	data["buffers"]=new_buffers
 
 	data["radiationIntensity"] = radiation_intensity