Merge pull request #2 from ArchieBeepBoop/master

Update Dev Branch

code/modules/mob/dead/observer/notificationprefs.dm

@@ -3,12 +3,10 @@
 	set name = "Notification preferences"
 	set desc = "Notification preferences"
 
-	var/datum/notificationpanel/panel  = new(usr)
+	var/datum/notificationpanel/panel = new(usr)
 
 	panel.ui_interact(usr)
 
-
-
 /datum/notificationpanel
 	var/client/user
 
@@ -21,10 +19,13 @@
 	else
 		src.user = user
 
-/datum/notificationpanel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/notificationpanel/ui_state(mob/user)
+	return GLOB.observer_state
+
+/datum/notificationpanel/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "NotificationPreferences", "Notification Preferences", 270, 360, master_ui, state)
+		ui = new(user, src, "NotificationPreferences")
 		ui.open()
 
 /datum/notificationpanel/ui_data(mob/user)
@@ -35,8 +36,7 @@
 			"key" = key,
 			"enabled" = (user.ckey in GLOB.poll_ignore[key]),
 			"desc" = GLOB.poll_ignore_desc[key]
-			))
-
+		))
 
 /datum/notificationpanel/ui_act(action, params)
 	if(..())

code/modules/mob/dead/observer/orbit.dm

@@ -6,9 +6,12 @@
 		qdel(src)
 	owner = new_owner
 
-/datum/orbit_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)
+/datum/orbit_menu/ui_state(mob/user)
+	return GLOB.observer_state
+
+/datum/orbit_menu/ui_interact(mob/user, datum/tgui/ui)
 	if (!ui)
-		ui = new(user, src, ui_key, "Orbit", "Orbit", 350, 700, master_ui, state)
+		ui = new(user, src, "Orbit")
 		ui.open()
 
 /datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -16,11 +19,10 @@
 		return
 
 	if (action == "orbit")
-		var/list/pois = getpois(skip_mindless = 1)
-		var/atom/movable/poi = pois[params["name"]]
+		var/ref = params["ref"]
+		var/atom/movable/poi = (locate(ref) in GLOB.mob_list) || (locate(ref) in GLOB.poi_list)
 		if (poi != null)
 			owner.ManualFollow(poi)
-			ui.close()
 
 /datum/orbit_menu/ui_data(mob/user)
 	var/list/data = list()
@@ -39,6 +41,8 @@
 
 		var/poi = pois[name]
 
+		serialized["ref"] = REF(poi)
+
 		var/mob/M = poi
 		if (istype(M))
 			if (isobserver(M))