Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

Conflicts:
	code/game/objects/items/devices/uplink.dm

code/game/objects/items/devices/uplink.dm

@@ -7,10 +7,16 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 */
 
 /obj/item/device/uplink
-	var/welcome =	"Illegal Uplink Console"	// Welcoming menu message
-	var/uses = DEFAULT_TELECRYSTAL_AMOUNT		// Numbers of crystals
-	var/list/purchase_log
-	var/datum/mind/owner = null
+	var/welcome 			// Welcoming menu message
+	var/uses 				// Numbers of crystals
+	var/list/ItemsCategory	// List of categories with lists of items
+	var/list/ItemsReference	// List of references with an associated item
+	var/list/nanoui_items	// List of items for NanoUI use
+	var/nanoui_menu = 0		// The current menu we are in
+	var/list/nanoui_data = new // Additional data for NanoUI use
+
+	var/list/purchase_log = new
+	var/datum/mind/uplink_owner = null
 	var/used_TC = 0
 
 /obj/item/device/uplink/nano_host()
@@ -18,7 +24,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 
 /obj/item/device/uplink/New(var/location, var/datum/mind/owner)
 	..()
-	src.owner = owner
+	src.uplink_owner = owner
 	purchase_log = list()
 	world_uplinks += src
 
@@ -42,10 +48,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	name = "hidden uplink"
 	desc = "There is something wrong if you're examining this."
 	var/active = 0
-	var/nanoui_menu = 0							// The current menu we are in
 	var/datum/uplink_category/category 	= 0		// The current category we are in
 	var/exploit_id								// Id of the current exploit record we are viewing
-	var/list/nanoui_data						// Data for NanoUI use
 
 
 // The hidden uplink MUST be inside an obj/item's contents.

code/game/objects/items/devices/uplink_items.dm

@@ -59,12 +59,12 @@ var/datum/uplink/uplink = new()
 		return 1
 
 	// With no owner, there's no need to check antag status.
-	if(!U.owner)
+	if(!U.uplink_owner)
 		return 0
 
 	for(var/antag_role in antag_roles)
 		var/datum/antagonist/antag = all_antag_types[antag_role]
-		if(antag.is_antagonist(U.owner))
+		if(antag.is_antagonist(U.uplink_owner))
 			return 1
 	return 0