actual code chang

2020-07-22 12:02:31 +08:00
parent 49941ea2e6
commit d5a6a3ecd9
20 changed files with 564 additions and 585 deletions
@@ -201,15 +201,15 @@
 	. = ..()
 	. += "<span class='notice'>Alt-click [src] to [state_open ? "close" : "open"] it.</span>"

-/obj/machinery/sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+/obj/machinery/sleeper/ui_state(mob/user)
+	if(controls_inside)
+		return GLOB.notcontained_state
+	return GLOB.default_state

-	if(controls_inside && state == GLOB.notcontained_state)
-		state = GLOB.default_state // If it has a set of controls on the inside, make it actually controllable by the mob in it.
-
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/sleeper/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "Sleeper", name, 550, 700, master_ui, state)
+		ui = new(user, src, "Sleeper", name)
 		ui.open()

 /obj/machinery/sleeper/process()
@@ -93,13 +93,10 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 		for(var/channel in channels)
 			radio.talk_into(src, message, channel)

-//config stuff
-
-/obj/machinery/announcement_system/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	. = ..()
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/announcement_system/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "AutomatedAnnouncement", "Automated Announcement System", 500, 225, master_ui, state)
+		ui = new(user, src, "AutomatedAnnouncement")
 		ui.open()

 /obj/machinery/announcement_system/ui_data()
@@ -3,6 +3,7 @@
 	desc = "A machine used to deposit and withdraw station funds."
 	icon = 'goon/icons/obj/goon_terminals.dmi'
 	idle_power_usage = 100
+
 	var/siphoning = FALSE
 	var/next_warning = 0
 	var/obj/item/radio/radio
@@ -38,7 +39,6 @@
 		return
 	return ..()

-
 /obj/machinery/computer/bank_machine/process()
 	..()
 	if(siphoning)
@@ -51,7 +51,7 @@
 			end_syphon()
 			return

-		playsound(src.loc, 'sound/items/poster_being_created.ogg', 100, 1)
+		playsound(src, 'sound/items/poster_being_created.ogg', 100, TRUE)
 		syphoning_credits += 200
 		D.adjust_money(-200)
 		if(next_warning < world.time && prob(15))
@@ -60,17 +60,20 @@
 			radio.talk_into(src, message, radio_channel)
 			next_warning = world.time + minimum_time_between_warnings

-/obj/machinery/computer/bank_machine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/bank_machine/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "BankMachine", name, 320, 165, master_ui, state)
+		ui = new(user, src, "BankMachine", name)
 		ui.open()

 /obj/machinery/computer/bank_machine/ui_data(mob/user)
 	var/list/data = list()
 	var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
-	data["current_balance"] = D.account_balance
+
+	if(D)
+		data["current_balance"] = D.account_balance
+	else
+		data["current_balance"] = 0
 	data["siphoning"] = siphoning
 	data["station_name"] = station_name()

@@ -20,64 +20,45 @@
 	else
 		return ..()

-/obj/machinery/computer/aifixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+
+/obj/machinery/computer/aifixer/ui_interact(mob/user, datum/tgui/ui) //artur didn't port this correctly
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "AiRestorer", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "AiRestorer", name)
 		ui.open()

-	var/dat = ""
+/obj/machinery/computer/aifixer/ui_data(mob/user)
+	var/list/data = list()

-	if (src.occupier)
-		var/laws
-		dat += "<h3>Stored AI: [src.occupier.name]</h3>"
-		dat += "<b>System integrity:</b> [(src.occupier.health+100)/2]%<br>"
+	data["ejectable"] = FALSE
+	data["AI_present"] = FALSE
+	data["error"] = null
+	if(!occupier)
+		data["error"] = "Please transfer an AI unit."
+	else
+		data["AI_present"] = TRUE
+		data["name"] = occupier.name
+		data["restoring"] = restoring
+		data["health"] = (occupier.health + 100) / 2
+		data["isDead"] = occupier.stat == DEAD
+		data["laws"] = occupier.laws.get_law_list(include_zeroth = TRUE, render_html = FALSE)

-		if (src.occupier.laws.zeroth)
-			laws += "<b>0:</b> [src.occupier.laws.zeroth]<BR>"
+	return data

-		for (var/index = 1, index <= src.occupier.laws.hacked.len, index++)
-			var/law = src.occupier.laws.hacked[index]
-			if (length(law) > 0)
-				var/num = ionnum()
-				laws += "<b>[num]:</b> [law]<BR>"
+/obj/machinery/computer/aifixer/ui_act(action, params)
+	if(..())
+		return
+	if(!occupier)
+		restoring = FALSE

-		for (var/index = 1, index <= src.occupier.laws.ion.len, index++)
-			var/law = src.occupier.laws.ion[index]
-			if (length(law) > 0)
-				var/num = ionnum()
-				laws += "<b>[num]:</b> [law]<BR>"
-
-		var/number = 1
-		for (var/index = 1, index <= src.occupier.laws.inherent.len, index++)
-			var/law = src.occupier.laws.inherent[index]
-			if (length(law) > 0)
-				laws += "<b>[number]:</b> [law]<BR>"
-				number++
-
-		for (var/index = 1, index <= src.occupier.laws.supplied.len, index++)
-			var/law = src.occupier.laws.supplied[index]
-			if (length(law) > 0)
-				laws += "<b>[number]:</b> [law]<BR>"
-				number++
-
-		dat += "<b>Laws:</b><br>[laws]<br>"
-
-		if (src.occupier.stat == DEAD)
-			dat += "<span class='bad'>AI non-functional</span>"
-		else
-			dat += "<span class='good'>AI functional</span>"
-		if (!src.active)
-			dat += {"<br><br><A href='byond://?src=[REF(src)];fix=1'>Begin Reconstruction</A>"}
-		else
-			dat += "<br><br>Reconstruction in process, please wait.<br>"
-	dat += {"<br><A href='?src=[REF(user)];mach_close=computer'>Close</A>"}
-	var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-	return
+	switch(action)
+		if("PRG_beginReconstruction")
+			if(occupier?.health < 100)
+				to_chat(usr, "<span class='notice'>Reconstruction in progress. This will take several minutes.</span>")
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE)
+				restoring = TRUE
+				occupier.notify_ghost_cloning("Your core files are being restored!", source = src)
+				. = TRUE

 /obj/machinery/computer/aifixer/proc/Fix()
 	use_power(1000)
@@ -97,17 +78,6 @@
 			active = Fix()
 			if(oldstat != occupier.stat)
 				update_icon()
-		updateDialog()
-
-/obj/machinery/computer/aifixer/Topic(href, href_list)
-	if(..())
-		return
-	if(href_list["fix"])
-		to_chat(usr, "<span class='notice'>Reconstruction in progress. This will take several minutes.</span>")
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
-		active = TRUE
-		add_fingerprint(usr)
-	updateUsrDialog()

 /obj/machinery/computer/aifixer/update_overlays()
 	. = ..()
@@ -3,19 +3,19 @@
 	desc = "Used to remotely control the flow of power to different parts of the station."
 	icon_screen = "solar"
 	icon_keyboard = "power_key"
-	req_access = list(ACCESS_ENGINE)
+	req_access = list(ACCESS_CE)
 	circuit = /obj/item/circuitboard/computer/apc_control
 	light_color = LIGHT_COLOR_YELLOW
 	var/mob/living/operator //Who's operating the computer right now
 	var/obj/machinery/power/apc/active_apc //The APC we're using right now
-	var/list/result_filters //For sorting the results
-	var/checking_logs = 0
+	var/should_log = TRUE
+	var/restoring = FALSE
 	var/list/logs
-	var/auth_id = "\[NULL\]"
+	var/auth_id = "\[NULL\]:"

-/obj/machinery/computer/apc_control/Initialize()
+/obj/machinery/computer/apc_control/Initialize(mapload, obj/item/circuitboard/C)
 	. = ..()
-	result_filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null)
+	logs = list()

 /obj/machinery/computer/apc_control/process()
 	if(operator && (!operator.Adjacent(src) || stat))
@@ -23,8 +23,8 @@
 		if(active_apc)
 			if(!active_apc.locked)
 				active_apc.say("Remote access canceled. Interface locked.")
-				playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, 0)
-				playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, 0)
+				playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, FALSE)
+				playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, FALSE)
 			active_apc.locked = TRUE
 			active_apc.update_icon()
 			active_apc.remote_control = null
@@ -34,171 +34,163 @@
 	if(!IsAdminGhost(user))
 		to_chat(user,"<span class='warning'>[src] does not support AI control.</span>") //You already have APC access, cheater!
 		return
-	..(user)
+	..()

 /obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC)
 	return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors

-/obj/machinery/computer/apc_control/ui_interact(mob/living/user)
-	. = ..()
-	var/dat
-	if(authenticated)
-		if(!checking_logs)
-			dat += "Logged in as [auth_id].<br><br>"
-			dat += "<i>Filters</i><br>"
-			dat += "<b>Name:</b> <a href='?src=[REF(src)];name_filter=1'>[result_filters["Name"] ? result_filters["Name"] : "None set"]</a><br>"
-			dat += "<b>Charge:</b> <a href='?src=[REF(src)];above_filter=1'>\>[result_filters["Charge Above"] ? result_filters["Charge Above"] : "NaN"]%</a> and <a href='?src=[REF(src)];below_filter=1'>\<[result_filters["Charge Below"] ? result_filters["Charge Below"] : "NaN"]%</a><br>"
-			dat += "<b>Accessible:</b> <a href='?src=[REF(src)];access_filter=1'>[result_filters["Responsive"] ? "Non-Responsive Only" : "All"]</a><br><br>"
-			for(var/A in GLOB.apcs_list)
-				if(check_apc(A))
-					var/obj/machinery/power/apc/APC = A
-					if(result_filters["Name"] && !findtext(APC.name, result_filters["Name"]) && !findtext(APC.area.name, result_filters["Name"]))
-						continue
-					if(result_filters["Charge Above"] && (!APC.cell || (APC.cell && (APC.cell.charge / APC.cell.maxcharge) < result_filters["Charge Above"] / 100)))
-						continue
-					if(result_filters["Charge Below"] && APC.cell && (APC.cell.charge / APC.cell.maxcharge) > result_filters["Charge Below"] / 100)
-						continue
-					if(result_filters["Responsive"] && !APC.aidisabled)
-						continue
-					dat += "<a href='?src=[REF(src)];access_apc=[REF(APC)]'>[A]</a><br>\
-					<b>Charge:</b> [APC.cell ? "[DisplayEnergy(APC.cell.charge)] / [DisplayEnergy(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)" : "No Powercell Installed"]<br>\
-					<b>Area:</b> [APC.area]<br>\
-					[APC.aidisabled || APC.panel_open ? "<font color='#FF0000'>APC does not respond to interface query.</font>" : "<font color='#00FF00'>APC responds to interface query.</font>"]<br><br>"
-			dat += "<a href='?src=[REF(src)];check_logs=1'>Check Logs</a><br>"
-			dat += "<a href='?src=[REF(src)];log_out=1'>Log Out</a><br>"
-			if(obj_flags & EMAGGED)
-				dat += "<font color='#FF0000'>WARNING: Logging functionality partially disabled from outside source.</font><br>"
-				dat += "<a href='?src=[REF(src)];restore_logging=1'>Restore logging functionality?</a><br>"
-		else
-			if(logs.len)
-				for(var/entry in logs)
-					dat += "[entry]<br>"
-			else
-				dat += "<i>No activity has been recorded at this time.</i><br>"
-			if(obj_flags & EMAGGED)
-				dat += "<a href='?src=[REF(src)];clear_logs=1'><font color='#FF0000'>@#%! CLEAR LOGS</a>"
-			dat += "<a href='?src=[REF(src)];check_apcs=1'>Return</a>"
-		operator = user
-	else
-		dat = "<a href='?src=[REF(src)];authenticate=1'>Please swipe a valid ID to log in...</a>"
-	var/datum/browser/popup = new(user, "apc_control", name, 600, 400)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
-	popup.open()
+/obj/machinery/computer/apc_control/ui_interact(mob/user, datum/tgui/ui)
+	operator = user
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "ApcControl")
+		ui.open()

-/obj/machinery/computer/apc_control/Topic(href, href_list)
+/obj/machinery/computer/apc_control/ui_data(mob/user)
+	var/list/data = list()
+	data["auth_id"] = auth_id
+	data["authenticated"] = authenticated
+	data["emagged"] = obj_flags & EMAGGED
+	data["logging"] = should_log
+	data["restoring"] = restoring
+	data["logs"] = list()
+	data["apcs"] = list()
+
+	for(var/entry in logs)
+		data["logs"] += list(list("entry" = entry))
+
+	for(var/apc in GLOB.apcs_list)
+		if(check_apc(apc))
+			var/obj/machinery/power/apc/A = apc
+			var/has_cell = (A.cell) ? TRUE : FALSE
+			data["apcs"] += list(list(
+					"name" = A.area.name,
+					"operating" = A.operating,
+					"charge" = (has_cell) ? A.cell.percent() : "NOCELL",
+					"load" = DisplayPower(A.lastused_total),
+					"charging" = A.charging,
+					"chargeMode" = A.chargemode,
+					"eqp" = A.equipment,
+					"lgt" = A.lighting,
+					"env" = A.environ,
+					"responds" = A.aidisabled || A.panel_open,
+					"ref" = REF(A)
+				)
+			)
+	return data
+
+/obj/machinery/computer/apc_control/ui_act(action, params)
 	if(..())
 		return
-	if(!usr || !usr.canUseTopic(src) || stat || QDELETED(src))
-		return
-	if(href_list["authenticate"])
-		var/obj/item/card/id/ID = usr.get_idcard(TRUE)
-		if(ID && istype(ID))
-			if(check_access(ID))
+	switch(action)
+		if("log-in")
+			if(obj_flags & EMAGGED)
 				authenticated = TRUE
-				auth_id = "[ID.registered_name] ([ID.assignment])"
-				log_activity("logged in")
-	if(href_list["log_out"])
-		log_activity("logged out")
-		authenticated = FALSE
-		auth_id = "\[NULL\]"
-	if(href_list["restore_logging"])
-		to_chat(usr, "<span class='robot notice'>[icon2html(src, usr)] Logging functionality restored from backup data.</span>")
-		obj_flags &= ~EMAGGED
-		LAZYADD(logs, "<b>-=- Logging restored to full functionality at this point -=-</b>")
-	if(href_list["access_apc"])
-		playsound(src, "terminal_type", 50, 0)
-		var/obj/machinery/power/apc/APC = locate(href_list["access_apc"]) in GLOB.apcs_list
-		if(!APC || APC.aidisabled || APC.panel_open || QDELETED(APC))
-			to_chat(usr, "<span class='robot danger'>[icon2html(src, usr)] APC does not return interface request. Remote access may be disabled.</span>")
-			return
-		if(active_apc)
-			to_chat(usr, "<span class='robot danger'>[icon2html(src, usr)] Disconnected from [active_apc].</span>")
-			active_apc.say("Remote access canceled. Interface locked.")
-			playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, 0)
-			playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, 0)
-			active_apc.locked = TRUE
-			active_apc.update_icon()
-			active_apc.remote_control = null
-			active_apc = null
-		to_chat(usr, "<span class='robot notice'>[icon2html(src, usr)] Connected to APC in [get_area_name(APC.area, TRUE)]. Interface request sent.</span>")
-		log_activity("remotely accessed APC in [get_area_name(APC.area, TRUE)]")
-		APC.remote_control = src
-		APC.ui_interact(usr)
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-		message_admins("[ADMIN_LOOKUPFLW(usr)] remotely accessed [APC] from [src] at [AREACOORD(src)].")
-		log_game("[key_name(usr)] remotely accessed [APC] from [src] at [AREACOORD(src)].")
-		if(APC.locked)
-			APC.say("Remote access detected. Interface unlocked.")
-			playsound(APC, 'sound/machines/boltsup.ogg', 25, 0)
-			playsound(APC, 'sound/machines/terminal_alert.ogg', 50, 0)
-		APC.locked = FALSE
-		APC.update_icon()
-		active_apc = APC
-	if(href_list["name_filter"])
-		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-		var/new_filter = stripped_input(usr, "What name are you looking for?", name)
-		if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
-			return
-		log_activity("changed name filter to \"[new_filter]\"")
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-		result_filters["Name"] = new_filter
-	if(href_list["above_filter"])
-		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-		var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num
-		if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
-			return
-		log_activity("changed greater than charge filter to \"[new_filter]\"")
-		if(new_filter)
-			new_filter = clamp(new_filter, 0, 100)
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-		result_filters["Charge Above"] = new_filter
-	if(href_list["below_filter"])
-		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-		var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num
-		if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
-			return
-		log_activity("changed lesser than charge filter to \"[new_filter]\"")
-		if(new_filter)
-			new_filter = clamp(new_filter, 0, 100)
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-		result_filters["Charge Below"] = new_filter
-	if(href_list["access_filter"])
-		if(isnull(result_filters["Responsive"]))
-			result_filters["Responsive"] = 1
-			log_activity("sorted by non-responsive APCs only")
-		else
-			result_filters["Responsive"] = !result_filters["Responsive"]
-			log_activity("sorted by all APCs")
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-	if(href_list["check_logs"])
-		checking_logs = TRUE
-		log_activity("checked logs")
-	if(href_list["check_apcs"])
-		checking_logs = FALSE
-		log_activity("checked APCs")
-	if(href_list["clear_logs"])
-		logs = list()
-	ui_interact(usr) //Refresh the UI after a filter changes
+				auth_id = "Unknown (Unknown):"
+				log_activity("[auth_id] logged in to the terminal")
+				return
+			var/obj/item/card/id/ID = operator.get_idcard(TRUE)
+			if(ID && istype(ID))
+				if(check_access(ID))
+					authenticated = TRUE
+					auth_id = "[ID.registered_name] ([ID.assignment]):"
+					log_activity("[auth_id] logged in to the terminal")
+					playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
+				else
+					auth_id = "[ID.registered_name] ([ID.assignment]):"
+					log_activity("[auth_id] attempted to log into the terminal")
+				return
+			auth_id = "Unknown (Unknown):"
+			log_activity("[auth_id] attempted to log into the terminal")
+		if("log-out")
+			log_activity("[auth_id] logged out of the terminal")
+			playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
+			authenticated = FALSE
+			auth_id = "\[NULL\]"
+		if("toggle-logs")
+			should_log = !should_log
+			log_game("[key_name(operator)] set the logs of [src] in [AREACOORD(src)] [should_log ? "On" : "Off"]")
+		if("restore-console")
+			restoring = TRUE
+			addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9)
+		if("access-apc")
+			var/ref = params["ref"]
+			playsound(src, "terminal_type", 50, FALSE)
+			var/obj/machinery/power/apc/APC = locate(ref) in GLOB.apcs_list
+			if(!APC)
+				return
+			if(active_apc)
+				to_chat(operator, "<span class='robot danger'>[icon2html(src, auth_id)] Disconnected from [active_apc].</span>")
+				active_apc.say("Remote access canceled. Interface locked.")
+				playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, FALSE)
+				playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, FALSE)
+				active_apc.locked = TRUE
+				active_apc.update_icon()
+				active_apc.remote_control = null
+				active_apc = null
+			APC.remote_control = src
+			APC.ui_interact(operator)
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+			log_game("[key_name(operator)] remotely accessed [APC] from [src] at [AREACOORD(src)].")
+			log_activity("[auth_id] remotely accessed APC in [get_area_name(APC.area, TRUE)]")
+			if(APC.locked)
+				APC.say("Remote access detected. Interface unlocked.")
+				playsound(APC, 'sound/machines/boltsup.ogg', 25, FALSE)
+				playsound(APC, 'sound/machines/terminal_alert.ogg', 50, FALSE)
+			APC.locked = FALSE
+			APC.update_icon()
+			active_apc = APC
+		if("check-logs")
+			log_activity("Checked Logs")
+		if("check-apcs")
+			log_activity("Checked APCs")
+		if("toggle-minor")
+			var/ref = params["ref"]
+			var/type = params["type"]
+			var/value = params["value"]
+			var/obj/machinery/power/apc/target = locate(ref) in GLOB.apcs_list
+			if(!target)
+				return
+			target.vars[type] = target.setsubsystem(text2num(value))
+			target.update_icon()
+			target.update()
+			var/setTo = ""
+			switch(target.vars[type])
+				if(0)
+					setTo = "Off"
+				if(1)
+					setTo = "Auto Off"
+				if(2)
+					setTo = "On"
+				if(3)
+					setTo = "Auto On"
+			log_activity("Set APC [target.area.name] [type] to [setTo]")
+			log_game("[key_name(operator)] Set APC [target.area.name] [type] to [setTo]]")
+		if("breaker")
+			var/ref = params["ref"]
+			var/obj/machinery/power/apc/target = locate(ref) in GLOB.apcs_list
+			target.toggle_breaker()
+			var/setTo = target.operating ? "On" : "Off"
+			log_activity("Turned APC [target.area.name]'s breaker [setTo]")

 /obj/machinery/computer/apc_control/emag_act(mob/user)
-	. = ..()
-	if(!authenticated)
-		to_chat(user, "<span class='warning'>You bypass [src]'s access requirements using your emag.</span>")
-		authenticated = TRUE
-		log_activity("logged in")
-	else
-		if(obj_flags & EMAGGED)
-			return
-		user.visible_message("<span class='warning'>You emag [src], disabling precise logging and allowing you to clear logs.</span>")
-		log_game("[key_name(user)] emagged [src] at [AREACOORD(src)], disabling operator tracking.")
-		obj_flags |= EMAGGED
-		playsound(src, "sparks", 50, 1)
-	return TRUE
+	if(obj_flags & EMAGGED)
+		return
+	obj_flags |= EMAGGED
+	log_game("[key_name(user)] emagged [src] at [AREACOORD(src)]")
+	playsound(src, "sparks", 50, TRUE)

 /obj/machinery/computer/apc_control/proc/log_activity(log_text)
-	var/op_string = operator && !(obj_flags & EMAGGED) ? operator : "\[NULL OPERATOR\]"
-	LAZYADD(logs, "<b>([STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)])</b> [op_string] [log_text]")
+	if(!should_log)
+		return
+	LAZYADD(logs, "([station_time_timestamp()]): [auth_id] [log_text]")
+
+/obj/machinery/computer/apc_control/proc/restore_comp()
+	obj_flags &= ~EMAGGED
+	should_log = TRUE
+	log_game("[key_name(operator)] restored the logs of [src] in [AREACOORD(src)]")
+	log_activity("-=- Logging restored to full functionality at this point -=-")
+	restoring = FALSE

 /mob/proc/using_power_flow_console()
 	for(var/obj/machinery/computer/apc_control/A in range(1, src))
@@ -19,11 +19,10 @@
 	SSradio.remove_object(src, receive_frequency)
 	return ..()

-/obj/machinery/computer/atmos_alert/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/atmos_alert/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "AtmosAlertConsole", name, 350, 300, master_ui, state)
+		ui = new(user, src, "AtmosAlertConsole", name)
 		ui.open()

 /obj/machinery/computer/atmos_alert/ui_data(mob/user)
@@ -45,11 +44,11 @@
 		if("clear")
 			var/zone = params["zone"]
 			if(zone in priority_alarms)
-				to_chat(usr, "Priority alarm for [zone] cleared.")
+				to_chat(usr, "<span class='notice'>Priority alarm for [zone] cleared.</span>")
 				priority_alarms -= zone
 				. = TRUE
 			if(zone in minor_alarms)
-				to_chat(usr, "Minor alarm for [zone] cleared.")
+				to_chat(usr, "<span class='notice'>Minor alarm for [zone] cleared.</span>")
 				minor_alarms -= zone
 				. = TRUE
 	update_icon()
@@ -123,11 +123,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
 	SSradio.remove_object(src, frequency)
 	return ..()

-/obj/machinery/computer/atmos_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/atmos_control/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "AtmosControlConsole", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "AtmosControlConsole", name)
 		ui.open()

 /obj/machinery/computer/atmos_control/ui_data(mob/user)
@@ -51,74 +51,91 @@
 	else
 		icon_state = "[initial(icon_state)]"

-/obj/machinery/jukebox/ui_interact(mob/user)
-	. = ..()
-	if(!user.canUseTopic(src, !hasSiliconAccessInArea(user)))
-		return
-	if (!anchored)
+/obj/machinery/jukebox/ui_status(mob/user)
+	if(!anchored)
 		to_chat(user,"<span class='warning'>This device must be anchored by a wrench!</span>")
-		return
-	if(!allowed(user))
+		return UI_CLOSE
+	if(!allowed(user) && !isobserver(user))
 		to_chat(user,"<span class='warning'>Error: Access Denied.</span>")
-		user.playsound_local(src,'sound/misc/compiler-failure.ogg', 25, 1)
-		return
-	if(!SSjukeboxes.songs.len)
+		user.playsound_local(src, 'sound/misc/compiler-failure.ogg', 25, TRUE)
+		return UI_CLOSE
+	if(!SSjukeboxes.songs.len && !isobserver(user))
 		to_chat(user,"<span class='warning'>Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.</span>")
-		playsound(src,'sound/misc/compiler-failure.ogg', 25, 1)
-		return
-	var/list/dat = list()
-	dat +="<div class='statusDisplay' style='text-align:center'>"
-	dat += "<b><A href='?src=[REF(src)];action=toggle'>[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]<b></A><br>"
-	dat += "</div><br>"
-	dat += "<A href='?src=[REF(src)];action=select'> Select Track</A><br>"
-	if(istype(selection))
-		dat += "Track Selected: [selection.song_name]<br>"
-		dat += "Track Length: [DisplayTimeText(selection.song_length)]<br><br>"
-	else
-		dat += "Track Selected: None!<br><br>"
-	var/datum/browser/popup = new(user, "vending", "[name]", 400, 350)
-	popup.set_content(dat.Join())
-	popup.open()
+		playsound(src, 'sound/misc/compiler-failure.ogg', 25, TRUE)
+		return UI_CLOSE
+	return ..()

+/obj/machinery/jukebox/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "Jukebox", name)
+		ui.open()

-/obj/machinery/jukebox/Topic(href, href_list)
-	if(..())
+/obj/machinery/jukebox/ui_data(mob/user)
+	var/list/data = list()
+	data["active"] = active
+	data["songs"] = list()
+	for(var/datum/track/S in SSjukeboxes.songs)
+		var/list/track_data = list(
+			name = S.song_name
+		)
+		data["songs"] += list(track_data)
+	data["track_selected"] = null
+	data["track_length"] = null
+	data["track_beat"] = null
+	if(selection)
+		data["track_selected"] = selection.song_name
+		data["track_length"] = DisplayTimeText(selection.song_length)
+		data["track_beat"] = selection.song_beat
+	data["volume"] = volume
+	return data
+
+/obj/machinery/jukebox/ui_act(action, list/params)
+	. = ..()
+	if(.)
 		return
-	add_fingerprint(usr)
-	switch(href_list["action"])
+
+	switch(action)
 		if("toggle")
-			if (QDELETED(src))
+			if(QDELETED(src))
 				return
 			if(!active)
 				if(stop > world.time)
 					to_chat(usr, "<span class='warning'>Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].</span>")
-					playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1)
+					playsound(src, 'sound/misc/compiler-failure.ogg', 50, TRUE)
 					return
-				if(!istype(selection))
-					to_chat(usr, "<span class='warning'>Error: Severe user incompetence detected.</span>")
-					playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1)
-					return
-				if(!activate_music())
-					to_chat(usr, "<span class='warning'>Error: Generic hardware failure.</span>")
-					playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1)
-					return
-				updateUsrDialog()
-			else if(active)
+				activate_music()
+				START_PROCESSING(SSobj, src)
+				return TRUE
+			else
 				stop = 0
-				updateUsrDialog()
-		if("select")
+				return TRUE
+		if("select_track")
 			if(active)
 				to_chat(usr, "<span class='warning'>Error: You cannot change the song until the current one is over.</span>")
 				return
-
 			var/list/available = list()
 			for(var/datum/track/S in SSjukeboxes.songs)
 				available[S.song_name] = S
-			var/selected = input(usr, "Choose your song", "Track:") as null|anything in available
+			var/selected = params["track"]
 			if(QDELETED(src) || !selected || !istype(available[selected], /datum/track))
 				return
 			selection = available[selected]
-			updateUsrDialog()
+			return TRUE
+		if("set_volume")
+			var/new_volume = params["volume"]
+			if(new_volume  == "reset")
+				volume = initial(volume)
+				return TRUE
+			else if(new_volume == "min")
+				volume = 0
+				return TRUE
+			else if(new_volume == "max")
+				volume = 100
+				return TRUE
+			else if(text2num(new_volume) != null)
+				volume = text2num(new_volume)
+				return TRUE

 /obj/machinery/jukebox/proc/activate_music()
 	var/jukeboxslottotake = SSjukeboxes.addjukebox(src, selection, 2)
@@ -20,18 +20,15 @@
 	return ..()

 /obj/machinery/gulag_item_reclaimer/emag_act(mob/user)
-	. = ..()
 	if(obj_flags & EMAGGED) // emagging lets anyone reclaim all the items
 		return
 	req_access = list()
 	obj_flags |= EMAGGED
-	return TRUE

-/obj/machinery/gulag_item_reclaimer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/gulag_item_reclaimer/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "GulagItemReclaimer", name, 300, 400, master_ui, state)
+		ui = new(user, src, "GulagItemReclaimer", name)
 		ui.open()

 /obj/machinery/gulag_item_reclaimer/ui_data(mob/user)
@@ -60,20 +57,22 @@
 		mobs += list(mob_info)

 	data["mobs"] = mobs
-
-
 	data["can_reclaim"] = can_reclaim

 	return data

-/obj/machinery/gulag_item_reclaimer/ui_act(action, list/params)
+/obj/machinery/gulag_item_reclaimer/ui_act(action, params)
+	if(..())
+		return
+
 	switch(action)
 		if("release_items")
-			var/mob/M = locate(params["mobref"])
-			if(M == usr || allowed(usr))
-				drop_items(M)
-			else
-				to_chat(usr, "Access denied.")
+			var/mob/living/carbon/human/H = locate(params["mobref"]) in stored_items
+			if(H != usr && !allowed(usr))
+				to_chat(usr, "<span class='warning'>Access denied.</span>")
+				return
+			drop_items(H)
+			. = TRUE

 /obj/machinery/gulag_item_reclaimer/proc/drop_items(mob/user)
 	if(!stored_items[user])
@@ -25,7 +25,6 @@ Possible to do for anyone motivated enough:
 */

 GLOBAL_LIST_EMPTY(network_holopads)
-
 #define HOLOPAD_PASSIVE_POWER_USAGE 1
 #define HOLOGRAM_POWER_USAGE 2

@@ -34,34 +33,64 @@ GLOBAL_LIST_EMPTY(network_holopads)
 	desc = "It's a floor-mounted device for projecting holographic images."
 	icon_state = "holopad0"
 	layer = LOW_OBJ_LAYER
-	plane = ABOVE_WALL_PLANE
+	plane = FLOOR_PLANE
 	flags_1 = HEAR_1
+	req_access = list(ACCESS_KEYCARD_AUTH) //Used to allow for forced connecting to other (not secure) holopads. Anyone can make a call, though.
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 5
 	active_power_usage = 100
 	max_integrity = 300
 	armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
 	circuit = /obj/item/circuitboard/machine/holopad
-	var/list/masters //List of living mobs that use the holopad
-	var/list/holorays //Holoray-mob link.
-	var/last_request = 0 //to prevent request spam. ~Carn
-	var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating.
-	var/temp = ""
-	var/list/holo_calls	//array of /datum/holocalls
-	var/datum/holocall/outgoing_call	//do not modify the datums only check and call the public procs
-	var/obj/item/disk/holodisk/disk //Record disk
-	var/replay_mode = FALSE //currently replaying a recording
-	var/loop_mode = FALSE //currently looping a recording
-	var/record_mode = FALSE //currently recording
-	var/record_start = 0  	//recording start time
-	var/record_user			//user that inititiated the recording
-	var/obj/effect/overlay/holo_pad_hologram/replay_holo	//replay hologram
-	var/static/force_answer_call = FALSE	//Calls will be automatically answered after a couple rings, here for debugging
+	/// List of living mobs that use the holopad
+	var/list/masters
+	/// Holoray-mob link
+	var/list/holorays
+	/// To prevent request spam. ~Carn
+	var/last_request = 0
+	/// Change to change how far the AI can move away from the holopad before deactivating
+	var/holo_range = 5
+	/// Array of /datum/holocalls
+	var/list/holo_calls
+	/// Currently outgoing holocall, do not modify the datums only check and call the public procs
+	var/datum/holocall/outgoing_call
+	/// Record disk
+	var/obj/item/disk/holodisk/disk
+	/// Currently replaying a recording
+	var/replay_mode = FALSE
+	/// Currently looping a recording
+	var/loop_mode = FALSE
+	/// Currently recording
+	var/record_mode = FALSE
+	/// Recording start time
+	var/record_start = 0
+	/// User that inititiated the recording
+	var/record_user
+	/// Replay hologram
+	var/obj/effect/overlay/holo_pad_hologram/replay_holo
+	/// Calls will be automatically answered after a couple rings, here for debugging
+	var/static/force_answer_call = FALSE
+	// var/static/list/holopads = list()
 	var/obj/effect/overlay/holoray/ray
 	var/ringing = FALSE
 	var/offset = FALSE
 	var/on_network = TRUE
+	/// For pads in secure areas; do not allow forced connecting
+	var/secure = FALSE
+	/// If we are currently calling another holopad
+	var/calling = FALSE
+/*
+/obj/machinery/holopad/secure
+	name = "secure holopad"
+	desc = "It's a floor-mounted device for projecting holographic images. This one will refuse to auto-connect incoming calls."
+	secure = TRUE

+/obj/machinery/holopad/secure/Initialize()
+	. = ..()
+	var/obj/item/circuitboard/machine/holopad/board = circuit
+	board.secure = TRUE
+	board.build_path = /obj/machinery/holopad/secure
+*/
 /obj/machinery/holopad/tutorial
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	flags_1 = NODECONSTRUCT_1
@@ -78,7 +107,7 @@ GLOBAL_LIST_EMPTY(network_holopads)
 			new_disk.forceMove(src)
 			disk = new_disk

-/obj/machinery/holopad/tutorial/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/machinery/holopad/tutorial/attack_hand(mob/user)
 	if(!istype(user))
 		return
 	if(user.incapacitated() || !is_operational())
@@ -121,10 +150,8 @@ GLOBAL_LIST_EMPTY(network_holopads)
 	return ..()

 /obj/machinery/holopad/power_change()
-	if (powered())
-		stat &= ~NOPOWER
-	else
-		stat |= NOPOWER
+	. = ..()
+	if (!powered())
 		if(replay_mode)
 			replay_stop()
 		if(record_mode)
@@ -163,171 +190,150 @@ GLOBAL_LIST_EMPTY(network_holopads)

 	if(istype(P,/obj/item/disk/holodisk))
 		if(disk)
-			to_chat(user,"<span class='notice'>There's already a disk inside [src]</span>")
+			to_chat(user,"<span class='warning'>There's already a disk inside [src]!</span>")
 			return
 		if (!user.transferItemToLoc(P,src))
 			return
-		to_chat(user,"<span class='notice'>You insert [P] into [src]</span>")
+		to_chat(user,"<span class='notice'>You insert [P] into [src].</span>")
 		disk = P
-		updateDialog()
 		return

 	return ..()

+/obj/machinery/holopad/ui_status(mob/user)
+	if(!is_operational())
+		return UI_CLOSE
+	if(outgoing_call && !calling)
+		return UI_CLOSE
+	return ..()

-/obj/machinery/holopad/ui_interact(mob/living/carbon/human/user) //Carn: Hologram requests.
+/obj/machinery/holopad/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "Holopad", name)
+		ui.open()
+
+/obj/machinery/holopad/ui_data(mob/user)
+	var/list/data = list()
+	data["calling"] = calling
+	data["on_network"] = on_network
+	data["on_cooldown"] = last_request + 200 < world.time ? FALSE : TRUE
+	data["allowed"] = allowed(user)
+	data["disk"] = disk ? TRUE : FALSE
+	data["disk_record"] = disk?.record ? TRUE : FALSE
+	data["replay_mode"] = replay_mode
+	data["loop_mode"] = loop_mode
+	data["record_mode"] = record_mode
+	data["holo_calls"] = list()
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		var/list/call_data = list(
+			caller = HC.user,
+			connected = HC.connected_holopad == src ? TRUE : FALSE,
+			ref = REF(HC)
+		)
+		data["holo_calls"] += list(call_data)
+	return data
+
+/obj/machinery/holopad/ui_act(action, list/params)
 	. = ..()
-	if(!istype(user))
+	if(.)
 		return

-	if(outgoing_call || user.incapacitated() || !is_operational())
-		return
-
-	user.set_machine(src)
-	var/dat
-	if(temp)
-		dat = temp
-	else
-		if(on_network)
-			dat += "<a href='?src=[REF(src)];AIrequest=1'>Request an AI's presence</a><br>"
-			dat += "<a href='?src=[REF(src)];Holocall=1'>Call another holopad</a><br>"
-		if(disk)
-			if(disk.record)
-				//Replay
-				dat += "<a href='?src=[REF(src)];replay_start=1'>Replay disk recording</a><br>"
-				dat += "<a href='?src=[REF(src)];loop_start=1'>Loop disk recording</a><br>"
-				//Clear
-				dat += "<a href='?src=[REF(src)];record_clear=1'>Clear disk recording</a><br>"
+	switch(action)
+		if("AIrequest")
+			if(last_request + 200 < world.time)
+				last_request = world.time
+				to_chat(usr, "<span class='info'>You requested an AI's presence.</span>")
+				var/area/area = get_area(src)
+				for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs)
+					if(!AI.client)
+						continue
+					to_chat(AI, "<span class='info'>Your presence is requested at <a href='?src=[REF(AI)];jumptoholopad=[REF(src)]'>\the [area]</a>.</span>")
+				return TRUE
 			else
-				//Record
-				dat += "<a href='?src=[REF(src)];record_start=1'>Start new recording</a><br>"
-			//Eject
-			dat += "<a href='?src=[REF(src)];disk_eject=1'>Eject disk</a><br>"
+				to_chat(usr, "<span class='info'>A request for AI presence was already sent recently.</span>")
+				return
+		if("holocall")
+			if(outgoing_call)
+				return
+			if(usr.loc == loc)
+				var/list/callnames = list()
+				for(var/I in GLOB.network_holopads)
+					var/area/A = get_area(I)
+					if(A)
+						LAZYADD(callnames[A], I)
+				callnames -= get_area(src)
+				var/result = input(usr, "Choose an area to call", "Holocall") as null|anything in sortNames(callnames)
+				if(QDELETED(usr) || !result || outgoing_call)
+					return
+				if(usr.loc == loc)
+					var/input = text2num(params["headcall"])
+					var/headcall = input == 1 ? TRUE : FALSE
+					new /datum/holocall(usr, src, callnames[result], headcall)
+					calling = TRUE
+					return TRUE
+			else
+				to_chat(usr, "<span class='warning'>You must stand on the holopad to make a call!</span>")
+		if("connectcall")
+			var/datum/holocall/call_to_connect = locate(params["holopad"]) in holo_calls
+			if(!QDELETED(call_to_connect))
+				call_to_connect.Answer(src)
+				return TRUE
+		if("disconnectcall")
+			var/datum/holocall/call_to_disconnect = locate(params["holopad"]) in holo_calls
+			if(!QDELETED(call_to_disconnect))
+				call_to_disconnect.Disconnect(src)
+				return TRUE
+		if("disk_eject")
+			if(disk && !replay_mode)
+				disk.forceMove(drop_location())
+				disk = null
+				return TRUE
+		if("replay_mode")
+			if(replay_mode)
+				replay_stop()
+				return TRUE
+			else
+				replay_start()
+				return TRUE
+		if("loop_mode")
+			loop_mode = !loop_mode
+			return TRUE
+		if("record_mode")
+			if(record_mode)
+				record_stop()
+				return TRUE
+			else
+				record_start(usr)
+				return TRUE
+		if("record_clear")
+			record_clear()
+			return TRUE
+		if("offset")
+			offset++
+			if(offset > 4)
+				offset = FALSE
+			var/turf/new_turf
+			if(!offset)
+				new_turf = get_turf(src)
+			else
+				new_turf = get_step(src, GLOB.cardinals[offset])
+			replay_holo.forceMove(new_turf)
+			return TRUE
+		if("hang_up")
+			if(outgoing_call)
+				outgoing_call.Disconnect(src)
+				return TRUE

-		if(LAZYLEN(holo_calls))
-			dat += "=====================================================<br>"
-
-		if(on_network)
-			var/one_answered_call = FALSE
-			var/one_unanswered_call = FALSE
-			for(var/I in holo_calls)
-				var/datum/holocall/HC = I
-				if(HC.connected_holopad != src)
-					dat += "<a href='?src=[REF(src)];connectcall=[REF(HC)]'>Answer call from [get_area(HC.calling_holopad)]</a><br>"
-					one_unanswered_call = TRUE
-				else
-					one_answered_call = TRUE
-
-			if(one_answered_call && one_unanswered_call)
-				dat += "=====================================================<br>"
-			//we loop twice for formatting
-			for(var/I in holo_calls)
-				var/datum/holocall/HC = I
-				if(HC.connected_holopad == src)
-					dat += "<a href='?src=[REF(src)];disconnectcall=[REF(HC)]'>Disconnect call from [HC.user]</a><br>"
-
-
-	var/datum/browser/popup = new(user, "holopad", name, 300, 175)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-
-//Stop ringing the AI!!
+/**
+  * hangup_all_calls: Disconnects all current holocalls from the holopad
+  */
 /obj/machinery/holopad/proc/hangup_all_calls()
 	for(var/I in holo_calls)
 		var/datum/holocall/HC = I
 		HC.Disconnect(src)

-/obj/machinery/holopad/Topic(href, href_list)
-	if(..() || isAI(usr))
-		return
-	add_fingerprint(usr)
-	if(!is_operational())
-		return
-	if (href_list["AIrequest"])
-		if(last_request + 200 < world.time)
-			last_request = world.time
-			temp = "You requested an AI's presence.<BR>"
-			temp += "<A href='?src=[REF(src)];mainmenu=1'>Main Menu</A>"
-			var/area/area = get_area(src)
-			for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs)
-				if(!AI.client)
-					continue
-				to_chat(AI, "<span class='info'>Your presence is requested at <a href='?src=[REF(AI)];jumptoholopad=[REF(src)]'>\the [area]</a>.</span>")
-		else
-			temp = "A request for AI presence was already sent recently.<BR>"
-			temp += "<A href='?src=[REF(src)];mainmenu=1'>Main Menu</A>"
-
-	else if(href_list["Holocall"])
-		if(outgoing_call)
-			return
-
-		temp = "You must stand on the holopad to make a call!<br>"
-		temp += "<A href='?src=[REF(src)];mainmenu=1'>Main Menu</A>"
-		if(usr.loc == loc)
-			var/list/callnames = list()
-			for(var/I in GLOB.network_holopads)
-				var/area/A = get_area(I)
-				if(A)
-					LAZYADD(callnames[A], I)
-			callnames -= get_area(src)
-
-			var/result = input(usr, "Choose an area to call", "Holocall") as null|anything in callnames
-			if(QDELETED(usr) || !result || outgoing_call)
-				return
-
-			if(usr.loc == loc)
-				temp = "Dialing...<br>"
-				temp += "<A href='?src=[REF(src)];mainmenu=1'>Main Menu</A>"
-				new /datum/holocall(usr, src, callnames[result])
-
-	else if(href_list["connectcall"])
-		var/datum/holocall/call_to_connect = locate(href_list["connectcall"])
-		if(!QDELETED(call_to_connect))
-			call_to_connect.Answer(src)
-		temp = ""
-
-	else if(href_list["disconnectcall"])
-		var/datum/holocall/call_to_disconnect = locate(href_list["disconnectcall"])
-		if(!QDELETED(call_to_disconnect))
-			call_to_disconnect.Disconnect(src)
-		temp = ""
-
-	else if(href_list["mainmenu"])
-		temp = ""
-		if(outgoing_call)
-			outgoing_call.Disconnect()
-
-	else if(href_list["disk_eject"])
-		if(disk && !replay_mode)
-			disk.forceMove(drop_location())
-			disk = null
-
-	else if(href_list["replay_stop"])
-		replay_stop()
-	else if(href_list["replay_start"])
-		replay_start()
-	else if(href_list["loop_start"])
-		loop_mode = TRUE
-		replay_start()
-	else if(href_list["record_start"])
-		record_start(usr)
-	else if(href_list["record_stop"])
-		record_stop()
-	else if(href_list["record_clear"])
-		record_clear()
-	else if(href_list["offset"])
-		offset++
-		if (offset > 4)
-			offset = FALSE
-		var/turf/new_turf
-		if (!offset)
-			new_turf = get_turf(src)
-		else
-			new_turf = get_step(src, GLOB.cardinals[offset])
-		replay_holo.forceMove(new_turf)
-	updateDialog()
-
 //do not allow AIs to answer calls or people will use it to meta the AI sattelite
 /obj/machinery/holopad/attack_ai(mob/living/silicon/ai/user)
 	if (!istype(user))
@@ -366,6 +372,9 @@ GLOBAL_LIST_EMPTY(network_holopads)
 			if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2)))
 				HC.Answer(src)
 				break
+			if(HC.head_call && !secure)
+				HC.Answer(src)
+				break
 			if(outgoing_call)
 				HC.Disconnect(src)//can't answer calls while calling
 			else
@@ -412,17 +421,17 @@ GLOBAL_LIST_EMPTY(network_holopads)

 /*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
 For the other part of the code, check silicon say.dm. Particularly robot talk.*/
-/obj/machinery/holopad/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source)
+/obj/machinery/holopad/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, list/message_mods = list())
 	. = ..()
 	if(speaker && LAZYLEN(masters) && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios.
 		for(var/mob/living/silicon/ai/master in masters)
 			if(masters[master] && speaker != master)
-				master.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
+				master.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mods)

 	for(var/I in holo_calls)
 		var/datum/holocall/HC = I
 		if(HC.connected_holopad == src && speaker != HC.hologram)
-			HC.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans, message_mode, source)
+			HC.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans, message_mods)

 	if(outgoing_call && speaker == outgoing_call.user)
 		outgoing_call.hologram.say(raw_message)
@@ -449,7 +458,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	else
 		icon_state = "holopad0"

-/obj/machinery/holopad/proc/set_holo(mob/living/user, var/obj/effect/overlay/holo_pad_hologram/h)
+/obj/machinery/holopad/proc/set_holo(mob/living/user, obj/effect/overlay/holo_pad_hologram/h)
 	LAZYSET(masters, user, h)
 	LAZYSET(holorays, user, new /obj/effect/overlay/holoray(loc))
 	var/mob/living/silicon/ai/AI = user
@@ -504,7 +513,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	else
 		return FALSE

-/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf, direction)
+/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf)
 	if(LAZYLEN(masters) && masters[user])
 		var/obj/effect/overlay/holo_pad_hologram/holo = masters[user]
 		var/transfered = FALSE
@@ -516,8 +525,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 				transfered = TRUE
 		//All is good.
 		holo.forceMove(new_turf)
-		if(direction)
-			holo.setDir(direction)
 		if(!transfered)
 			update_holoray(user,new_turf)
 	return TRUE
@@ -568,22 +575,15 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	if(!replay_mode)
 		replay_mode = TRUE
 		replay_holo = setup_replay_holo(disk.record)
-		temp = "Replaying...<br>"
-		temp += "<A href='?src=[REF(src)];offset=1'>Change offset</A><br>"
-		temp += "<A href='?src=[REF(src)];replay_stop=1'>End replay</A>"
 		SetLightsAndPower()
 		replay_entry(1)
-	return

 /obj/machinery/holopad/proc/replay_stop()
 	if(replay_mode)
 		replay_mode = FALSE
-		loop_mode = FALSE
 		offset = FALSE
-		temp = null
 		QDEL_NULL(replay_holo)
 		SetLightsAndPower()
-		updateDialog()

 /obj/machinery/holopad/proc/record_start(mob/living/user)
 	if(!user || !disk || disk.record)
@@ -593,8 +593,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	record_start = world.time
 	record_user = user
 	disk.record.set_caller_image(user)
-	temp = "Recording...<br>"
-	temp += "<A href='?src=[REF(src)];record_stop=1'>End recording.</A>"

 /obj/machinery/holopad/proc/record_message(mob/living/speaker,message,language)
 	if(!record_mode)
@@ -641,7 +639,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 			if(replay_holo)
 				replay_holo.say(message)
 		if(HOLORECORD_SOUND)
-			playsound(src,entry[2],50,1)
+			playsound(src,entry[2],50,TRUE)
 		if(HOLORECORD_DELAY)
 			addtimer(CALLBACK(src,.proc/replay_entry,entry_number+1),entry[2])
 			return
@@ -660,14 +658,11 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 /obj/machinery/holopad/proc/record_stop()
 	if(record_mode)
 		record_mode = FALSE
-		temp = null
 		record_user = null
-		updateDialog()

 /obj/machinery/holopad/proc/record_clear()
 	if(disk && disk.record)
 		QDEL_NULL(disk.record)
-	updateDialog()

 /obj/effect/overlay/holo_pad_hologram
 	initial_language_holder = /datum/language_holder/universal
@@ -6,14 +6,12 @@
 	circuit = /obj/item/circuitboard/machine/hypnochair
 	density = TRUE
 	opacity = 0
-	ui_x = 375
-	ui_y = 480
+
 	var/mob/living/carbon/victim = null ///Keeps track of the victim to apply effects if it teleports away
 	var/interrogating = FALSE ///Is the device currently interrogating someone?
 	var/start_time = 0 ///Time when the interrogation was started, to calculate effect in case of interruption
 	var/trigger_phrase = "" ///Trigger phrase to implant
 	var/timerid = 0 ///Timer ID for interrogations
-
 	var/message_cooldown = 0 ///Cooldown for breakout message

 /obj/machinery/hypnochair/Initialize()
@@ -25,24 +23,24 @@
 	if(!occupant && default_deconstruction_screwdriver(user, icon_state, icon_state, I))
 		update_icon()
 		return
-
 	if(default_pry_open(I))
 		return
-
 	if(default_deconstruction_crowbar(I))
 		return
-
 	return ..()

-/obj/machinery/hypnochair/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/hypnochair/ui_state(mob/user)
+	return GLOB.notcontained_state
+
+/obj/machinery/hypnochair/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "HypnoChair", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "HypnoChair", name)
 		ui.open()

 /obj/machinery/hypnochair/ui_data()
 	var/list/data = list()
-	data["occupied"] = occupant ? TRUE : FALSE
+	data["occupied"] = occupant ? 1 : 0
 	data["open"] = state_open
 	data["interrogating"] = interrogating

@@ -203,3 +201,4 @@
 		if(!(L.mobility_flags & MOBILITY_STAND))
 			return
 	close_machine(target)
+
@@ -282,12 +282,14 @@
 	ui_interact(user)
 	to_chat(user, "<span class='notice'>[src] projects a display onto your retina.</span>")

-/obj/item/launchpad_remote/ui_interact(mob/user, ui_key = "launchpad_remote", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "LaunchpadRemote", "Briefcase Launchpad Remote", 300, 240, master_ui, state) //width, height
-		ui.open()
+/obj/item/launchpad_remote/ui_state(mob/user)
+	return GLOB.inventory_state

+/obj/item/launchpad_remote/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "LaunchpadRemote")
+		ui.open()
 	ui.set_autoupdate(TRUE)

 /obj/item/launchpad_remote/ui_data(mob/user)
@@ -170,12 +170,10 @@
 	..()
 	default_unfasten_wrench(user, I, 5)
 	return TRUE
-
-/obj/machinery/space_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/space_heater/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "SpaceHeater", name, 400, 305, master_ui, state)
+		ui = new(user, src, "SpaceHeater", name)
 		ui.open()

 /obj/machinery/space_heater/ui_data()
@@ -210,7 +208,7 @@
 		if("power")
 			on = !on
 			mode = HEATER_MODE_STANDBY
-			usr.visible_message("[usr] switches [on ? "on" : "off"] \the [src].", "<span class='notice'>You switch [on ? "on" : "off"] \the [src].</span>")
+			usr.visible_message("<span class='notice'>[usr] switches [on ? "on" : "off"] \the [src].</span>", "<span class='notice'>You switch [on ? "on" : "off"] \the [src].</span>")
 			update_icon()
 			if (on)
 				START_PROCESSING(SSmachines, src)
@@ -222,16 +220,7 @@
 			if(!panel_open)
 				return
 			var/target = params["target"]
-			var/adjust = text2num(params["adjust"])
-			if(target == "input")
-				target = input("New target temperature:", name, round(targetTemperature - T0C, 1)) as num|null
-				if(!isnull(target) && !..())
-					target += T0C
-					. = TRUE
-			else if(adjust)
-				target = targetTemperature + adjust
-				. = TRUE
-			else if(text2num(target) != null)
+			if(text2num(target) != null)
 				target= text2num(target) + T0C
 				. = TRUE
 			if(.)
@@ -379,11 +379,13 @@

 	return ..()

-/obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/suit_storage_unit/ui_state(mob/user)
+	return GLOB.notcontained_state
+
+/obj/machinery/suit_storage_unit/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "SuitStorageUnit", name, 400, 305, master_ui, state)
+		ui = new(user, src, "SuitStorageUnit", name)
 		ui.open()

 /obj/machinery/suit_storage_unit/ui_data()