Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2

# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm

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

@@ -41,6 +41,14 @@
 
 
 /obj/item/device/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "aicard.tmpl", "[name]", 600, 400, state = state)
+		ui.open()
+		ui.set_auto_update(1)
+
+
+/obj/item/device/aicard/ui_data(mob/user, datum/topic_state/state = inventory_state)
 	var/data[0]
 
 	var/mob/living/silicon/ai/AI = locate() in src
@@ -59,12 +67,7 @@
 		data["laws"] = laws
 		data["has_laws"] = laws.len
 
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "aicard.tmpl", "[name]", 600, 400, state = state)
-		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(1)
+	return data
 
 
 /obj/item/device/aicard/Topic(href, href_list, nowindow, state)

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

@@ -55,8 +55,8 @@
 	interact(user)
 
 /obj/item/device/camera_bug/check_eye(var/mob/user as mob)
-	if(user.stat || loc != user || !user.canmove || !user.can_see() || !current)
-		user.reset_view(null)
+	if(user.stat || loc != user || !user.canmove || !user.has_vision() || !current)
+		user.reset_perspective(null)
 		user.unset_machine()
 		return null
 
@@ -64,7 +64,7 @@
 	if(T.z != current.z || !current.can_use())
 		to_chat(user, "<span class='danger'>[src] has lost the signal.</span>")
 		current = null
-		user.reset_view(null)
+		user.reset_perspective(null)
 		user.unset_machine()
 		return null
 
@@ -184,7 +184,7 @@
 /obj/item/device/camera_bug/Topic(var/href,var/list/href_list)
 	if(usr != loc)
 		usr.unset_machine()
-		usr.reset_view(null)
+		usr.reset_perspective(null)
 		usr << browse(null, "window=camerabug")
 		return
 	usr.set_machine(src)
@@ -195,7 +195,7 @@
 		if(C)
 			track_mode = BUGMODE_MONITOR
 			current = C
-			usr.reset_view(null)
+			usr.reset_perspective(null)
 			interact()
 	if("track" in href_list)
 		var/atom/A = locate(href_list["track"])
@@ -214,7 +214,7 @@
 		interact()
 		return
 	if("close" in href_list)
-		usr.reset_view(null)
+		usr.reset_perspective(null)
 		usr.unset_machine()
 		current = null
 		return // I do not <- I do not remember what I was going to write in this comment -Sayu, sometime later
@@ -231,16 +231,16 @@
 			current = C
 			spawn(6)
 				if(src.check_eye(usr))
-					usr.reset_view(C)
+					usr.reset_perspective(C)
 					interact()
 				else
 					usr.unset_machine()
-					usr.reset_view(null)
+					usr.reset_perspective(null)
 					usr << browse(null, "window=camerabug")
 			return
 		else
 			usr.unset_machine()
-			usr.reset_view(null)
+			usr.reset_perspective(null)
 
 	interact()
 

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

@@ -83,7 +83,7 @@
 		A.loc = active_dummy.loc
 		if(ismob(A))
 			var/mob/M = A
-			M.reset_view(null)
+			M.reset_perspective(null)
 
 /obj/effect/dummy/chameleon
 	name = ""

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

@@ -33,6 +33,9 @@
 
 	song.ui_interact(user, ui_key, ui, force_open)
 
+/obj/item/device/guitar/ui_data(mob/user, datum/topic_state/state = default_state)
+	return song.ui_data(user, state)
+
 /obj/item/device/guitar/Topic(href, href_list)
 	song.Topic(href, href_list)
 

code/game/objects/items/devices/radio/electropack.dm

@@ -99,15 +99,17 @@
 
 
 /obj/item/device/radio/electropack/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "radio_electro.tmpl", "[name]", 400, 500)
+		ui.open()
+		ui.set_auto_update(1)
+
+/obj/item/device/radio/electropack/ui_data(mob/user, datum/topic_state/state = default_state)
 	var/data[0]
 
 	data["power"] = on
 	data["freq"] = format_frequency(frequency)
 	data["code"] = code
 
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "radio_electro.tmpl", "[name]", 400, 500)
-		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(1)
+	return data

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

@@ -110,6 +110,13 @@ var/global/list/default_medbay_channels = list(
 	return ui_interact(user)
 
 /obj/item/device/radio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 400, 550)
+		ui.open()
+		ui.set_auto_update(1)
+
+/obj/item/device/radio/ui_data(mob/user, datum/topic_state/state = default_state)
 	var/data[0]
 
 	data["mic_status"] = broadcasting
@@ -128,12 +135,7 @@ var/global/list/default_medbay_channels = list(
 	if(syndie)
 		data["useSyndMode"] = 1
 
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 400, 550)
-		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(1)
+	return data
 
 
 /obj/item/device/radio/proc/list_channels(var/mob/user)
@@ -762,6 +764,13 @@ var/global/list/default_medbay_channels = list(
 	. = ..()
 
 /obj/item/device/radio/borg/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 430, 500)
+		ui.open()
+		ui.set_auto_update(1)
+
+/obj/item/device/radio/borg/ui_data(mob/user, datum/topic_state/state = default_state)
 	var/data[0]
 
 	data["mic_status"] = broadcasting
@@ -782,12 +791,7 @@ var/global/list/default_medbay_channels = list(
 	data["has_subspace"] = 1
 	data["subspace"] = subspace_transmission
 
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 430, 500)
-		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(1)
+	return data
 
 /obj/item/device/radio/proc/config(op)
 	if(radio_controller)

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

@@ -381,9 +381,7 @@ REAGENT SCANNER
 
 /obj/item/device/mass_spectrometer/New()
 	..()
-	var/datum/reagents/R = new/datum/reagents(5)
-	reagents = R
-	R.my_atom = src
+	create_reagents(5)
 
 /obj/item/device/mass_spectrometer/on_reagent_change()
 	if(reagents.total_volume)

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

@@ -90,26 +90,26 @@
 	ui_interact(user)
 
 /obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	// update the ui if it exists, returns null if no ui is passed/found
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		// the ui does not exist, so we'll create a new() one
+        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
+		ui = new(user, src, ui_key, "transfer_valve.tmpl", "Tank Transfer Valve", 460, 280)
+		// open the new ui window
+		ui.open()
+		// auto update every Master Controller tick
+		//ui.set_auto_update(1)
 
-	// this is the data which will be sent to the ui
+/obj/item/device/transfer_valve/ui_data(mob/user, datum/topic_state/state = default_state)
 	var/data[0]
+
 	data["attachmentOne"] = tank_one ? tank_one.name : null
 	data["attachmentTwo"] = tank_two ? tank_two.name : null
 	data["valveAttachment"] = attached_device ? attached_device.name : null
 	data["valveOpen"] = valve_open ? 1 : 0
 
-	// update the ui if it exists, returns null if no ui is passed/found
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if(!ui)
-		// the ui does not exist, so we'll create a new() one
-        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
-		ui = new(user, src, ui_key, "transfer_valve.tmpl", "Tank Transfer Valve", 460, 280)
-		// when the ui is first opened this is the data it will use
-		ui.set_initial_data(data)
-		// open the new ui window
-		ui.open()
-		// auto update every Master Controller tick
-		//ui.set_auto_update(1)
+	return data
 
 /obj/item/device/transfer_valve/Topic(href, href_list)
 	..()
@@ -219,4 +219,4 @@
 // this doesn't do anything but the timer etc. expects it to be here
 // eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
 /obj/item/device/transfer_valve/proc/c_state()
-	return
+	return

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

@@ -187,8 +187,18 @@ var/list/world_uplinks = list()
 /*
 	NANO UI FOR UPLINK WOOP WOOP
 */
-/obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
 	var/title = "Remote Uplink"
+	// update the ui if it exists, returns null if no ui is passed/found
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		// the ui does not exist, so we'll create a new() one
+        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
+		ui = new(user, src, ui_key, "uplink.tmpl", title, 700, 600, state = state)
+		// open the new ui window
+		ui.open()
+
+/obj/item/device/uplink/hidden/ui_data(mob/user, datum/topic_state/state = inventory_state)
 	var/data[0]
 
 	data["welcome"] = welcome
@@ -200,17 +210,7 @@ var/list/world_uplinks = list()
 	data["nano_items"] = nanoui_items
 	data += nanoui_data
 
-	// update the ui if it exists, returns null if no ui is passed/found
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if(!ui)
-		// the ui does not exist, so we'll create a new() one
-        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
-		ui = new(user, src, ui_key, "uplink.tmpl", title, 700, 600, state = inventory_state)
-		// when the ui is first opened this is the data it will use
-		ui.set_initial_data(data)
-		// open the new ui window
-		ui.open()
-
+	return data
 
 // Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button.
 /obj/item/device/uplink/hidden/interact(mob/user)

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

@@ -38,5 +38,8 @@
 
 	song.ui_interact(user, ui_key, ui, force_open)
 
+/obj/item/device/violin/ui_data(mob/user, datum/topic_state/state = default_state)
+	return song.ui_data(user, state)
+
 /obj/item/device/violin/Topic(href, href_list)
 	song.Topic(href, href_list)