Merge conflict fix.

code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm

@@ -338,3 +338,6 @@ var/global/list/all_money_accounts = list()
 	for(var/datum/money_account/D in all_money_accounts)
 		if(D.account_number == account_number)
 			return D
+
+/obj/machinery/account_database/process()
+	return 0

code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm

@@ -70,8 +70,12 @@
 	D.name = "small parcel - 'EFTPOS access code'"
 
 /obj/item/device/eftpos/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines'
-		if(DB.z == src.z)
+	var/turf/location = get_turf(src)
+	if(!location)
+		return
+
+	for(var/obj/machinery/account_database/DB in machines) //Hotfix until someone finds out why it isn't in 'machines'
+		if(DB.z == location.z)
 			linked_db = DB
 			break
 
@@ -239,4 +243,4 @@
 	else
 		..()
 
-	//emag?
+	//emag?