Merge pull request #12853 from LetterN/TGUI-4

TGUI4 port
2020-08-09 05:46:21 -07:00
parent 60a29174fb 773509719a
commit f20f01cc6b
539 changed files with 15719 additions and 8963 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()

@@ -43,10 +43,13 @@
 			table.computer = src
 			break

-/obj/machinery/computer/operating/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.not_incapacitated_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/operating/ui_state(mob/user)
+	return GLOB.not_incapacitated_state
+
+/obj/machinery/computer/operating/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "OperatingComputer", name, 350, 470, master_ui, state)
+		ui = new(user, src, "OperatingComputer", name)
 		ui.open()

 /obj/machinery/computer/operating/ui_data(mob/user)
@@ -153,6 +156,8 @@
 			))
 	return data

+
+
 /obj/machinery/computer/operating/ui_act(action, params)
 	if(..())
 		return
@@ -2,14 +2,13 @@
 	name = "\improper AI system integrity restorer"
 	desc = "Used with intelliCards containing nonfunctional AIs to restore them to working order."
 	req_access = list(ACCESS_CAPTAIN, ACCESS_ROBOTICS, ACCESS_HEADS)
-	var/mob/living/silicon/ai/occupier = null
-	var/active = 0
-	circuit = /obj/item/circuitboard/computer/aifixer
 	icon_keyboard = "tech_key"
 	icon_screen = "ai-fixer"
 	light_color = LIGHT_COLOR_PINK
-	ui_x = 370
-	ui_y = 360
+	circuit = /obj/item/circuitboard/computer/aifixer
+
+	var/mob/living/silicon/ai/occupier = null
+	var/active = FALSE

 /obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params)
 	if(occupier && istype(I, /obj/item/screwdriver))
@@ -20,64 +19,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"] = active
+		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)
+		active = 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)
+				active = 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 +77,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("hh:mm:ss", world.time)]): [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()
@@ -91,8 +91,6 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
 	icon_screen = "tank"
 	icon_keyboard = "atmos_key"
 	circuit = /obj/item/circuitboard/computer/atmos_control
-	ui_x = 400
-	ui_y = 925

 	var/frequency = FREQ_ATMOS_STORAGE
 	var/list/sensors = list(
@@ -123,11 +121,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)
@@ -265,13 +262,6 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
 	for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
 		U.broadcast_status()

-/obj/machinery/computer/atmos_control/tank/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)
-	if(!ui)
-		ui = new(user, src, ui_key, "AtmosControlConsole", name, ui_x, ui_y, master_ui, state)
-		ui.open()
-
 /obj/machinery/computer/atmos_control/tank/ui_data(mob/user)
 	var/list/data = ..()
 	data["tank"] = TRUE
@@ -5,8 +5,6 @@
 	icon_keyboard = "security_key"
 	circuit = /obj/item/circuitboard/computer/security
 	light_color = LIGHT_COLOR_RED
-	ui_x = 870
-	ui_y = 708

 	var/list/network = list("ss13")
 	var/obj/machinery/camera/active_camera
@@ -55,11 +53,9 @@
 		network -= i
 		network += "[idnum][i]"

-/obj/machinery/computer/security/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)
+/obj/machinery/computer/security/ui_interact(mob/user, datum/tgui/ui)
 	// Update UI
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	ui = SStgui.try_update_ui(user, src, ui)
 	// Show static if can't use the camera
 	if(!active_camera?.can_use())
 		show_camera_static()
@@ -76,10 +72,11 @@
 			use_power(active_power_usage)
 		// Register map objects
 		user.client.register_map_obj(cam_screen)
-		user.client.register_map_obj(cam_plane_master)
+		for(var/plane in cam_plane_master)
+			user.client.register_map_obj(plane)
 		user.client.register_map_obj(cam_background)
 		// Open UI
-		ui = new(user, src, ui_key, "CameraConsole", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "CameraConsole", name)
 		ui.open()

 /obj/machinery/computer/security/ui_data()
@@ -76,11 +76,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 /datum/crewmonitor/Destroy()
 	return ..()

-/datum/crewmonitor/ui_interact(mob/user, ui_key = "crew", 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)
+/datum/crewmonitor/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if (!ui)
-		ui = new(user, src, ui_key, "CrewConsole", "crew monitor", 800, 600 , master_ui, state)
+		ui = new(user, src, "CrewConsole")
 		ui.open()

 /datum/crewmonitor/proc/show(mob/M, source)
@@ -220,9 +220,7 @@
 /obj/machinery/computer/scan_consolenew/examine(mob/user)
 	. = ..()

-/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	. = ..()
-
+/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, datum/tgui/ui)
 	// Most of ui_interact is spent setting variables for passing to the tgui
 	//  interface.
 	// We can also do some general state processing here too as it's a good
@@ -264,10 +262,9 @@
 	time_to_pulse = round((rad_pulse_timer - world.time)/10)

 	// Attempt to update tgui ui, open and update if needed.
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "DnaConsole", name, 539, 710, master_ui, state)
+		ui = new(user, src, "DnaConsole")
 		ui.open()

 /obj/machinery/computer/scan_consolenew/ui_data(mob/user)
@@ -53,10 +53,10 @@
 	var/obj/machinery/launchpad/pad = launchpads[number]
 	return pad

-/obj/machinery/computer/launchpad/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, 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/launchpad/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "LaunchpadConsole", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "LaunchpadConsole", name)
 		ui.open()

 /obj/machinery/computer/launchpad/ui_data(mob/user)
@@ -128,4 +128,4 @@
 		if("pull")
 			teleport(usr, current_pad, FALSE)
 			. = TRUE
-	. = TRUE
+	. = TRUE
@@ -6,8 +6,6 @@
 	icon_keyboard = "security_key"
 	req_access = list(ACCESS_ARMORY)
 	circuit = /obj/item/circuitboard/computer/gulag_teleporter_console
-	ui_x = 350
-	ui_y = 295

 	var/default_goal = 200
 	var/obj/machinery/gulag_teleporter/teleporter = null
@@ -21,11 +19,10 @@
 	. = ..()
 	scan_machinery()

-/obj/machinery/computer/prisoner/gulag_teleporter_computer/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/prisoner/gulag_teleporter_computer/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "GulagTeleporterConsole", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "GulagTeleporterConsole", name)
 		ui.open()

 /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_data(mob/user)
@@ -23,11 +23,10 @@
 		return
 	return TRUE

-/obj/machinery/computer/robotics/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/robotics/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "RoboticsControlConsole", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "RoboticsControlConsole", name)
 		ui.open()

 /obj/machinery/computer/robotics/ui_data(mob/user)
@@ -123,5 +122,5 @@
 					var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 					s.set_up(3, TRUE, D)
 					s.start()
-					D.visible_message("<span class='danger'>\the [D] self destructs!</span>")
+					D.visible_message("<span class='danger'>\the [D] self-destructs!</span>")
 					D.gib()
@@ -16,11 +16,10 @@
 	GLOB.alert_consoles -= src
 	return ..()

-/obj/machinery/computer/station_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/station_alert/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "StationAlertConsole", name, 325, 500, master_ui, state)
+		ui = new(user, src, "StationAlertConsole", name)
 		ui.open()

 /obj/machinery/computer/station_alert/ui_data(mob/user)
@@ -31,6 +30,7 @@
 		data["alarms"][class] = list()
 		for(var/area in alarms[class])
 			data["alarms"][class] += area
+
 	return data

 /obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/source)
@@ -34,11 +34,10 @@
 			break
 	return power_station

-obj/machinery/computer/teleporter/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/teleporter/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "Teleporter", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, "Teleporter", name)
 		ui.open()

 /obj/machinery/computer/teleporter/ui_data(mob/user)
@@ -56,7 +55,6 @@ obj/machinery/computer/teleporter/ui_interact(mob/user, ui_key = "main", datum/t

 	return data

-
 /obj/machinery/computer/teleporter/ui_act(action, params)
 	if(..())
 		return
@@ -92,16 +90,18 @@ obj/machinery/computer/teleporter/ui_interact(mob/user, ui_key = "main", datum/t
 			say("Processing hub calibration to target...")
 			calibrating = TRUE
 			power_station.update_icon()
-			spawn(50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
-				calibrating = FALSE
-				if(check_hub_connection())
-					power_station.teleporter_hub.calibrated = TRUE
-					say("Calibration complete.")
-				else
-					say("Error: Unable to detect hub.")
-				power_station.update_icon()
+			addtimer(CALLBACK(src, .proc/finish_calibration), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
 			. = TRUE

+/obj/machinery/computer/teleporter/proc/finish_calibration()
+	calibrating = FALSE
+	if(check_hub_connection())
+		power_station.teleporter_hub.calibrated = TRUE
+		say("Calibration complete.")
+	else
+		say("Error: Unable to detect hub.")
+	power_station.update_icon()
+
 /obj/machinery/computer/teleporter/proc/check_hub_connection()
 	if(!power_station)
 		return FALSE
@@ -9,6 +9,7 @@
 	var/active = FALSE
 	var/list/rangers = list()
 	var/stop = 0
+	var/volume = 70
 	var/datum/track/selection = null

 /obj/machinery/jukebox/disco
@@ -51,74 +52,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)
@@ -50,7 +50,7 @@
 	integrity_failure = 0.25
 	damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N
 	autoclose = TRUE
-	secondsElectrified = 0 //How many seconds remain until the door is no longer electrified. -1 if it is permanently electrified until someone fixes it.
+	secondsElectrified = NOT_ELECTRIFIED //How many seconds remain until the door is no longer electrified. -1 if it is permanently electrified until someone fixes it.
 	assemblytype = /obj/structure/door_assembly
 	normalspeed = 1
 	explosion_block = 1
@@ -298,10 +298,10 @@

 /obj/machinery/door/airlock/Destroy()
 	QDEL_NULL(wires)
+	QDEL_NULL(electronics)
 	if(charge)
 		qdel(charge)
 		charge = null
-	QDEL_NULL(electronics)
 	if (cyclelinkedairlock)
 		if (cyclelinkedairlock.cyclelinkedairlock == src)
 			cyclelinkedairlock.cyclelinkedairlock = null
@@ -309,7 +309,7 @@
 	if(id_tag)
 		for(var/obj/machinery/doorButtons/D in GLOB.machines)
 			D.removeMe(src)
-	qdel(note)
+	QDEL_NULL(note)
 	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
 		diag_hud.remove_from_hud(src)
 	return ..()
@@ -765,8 +765,8 @@

 /obj/machinery/door/airlock/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(!(issilicon(user) || IsAdminGhost(user)))
-		if(src.isElectrified())
-			if(src.shock(user, 100))
+		if(isElectrified())
+			if(shock(user, 100))
 				return

 	if(ishuman(user) && prob(40) && src.density)
@@ -790,15 +790,15 @@
 	return ..()

 /obj/machinery/door/airlock/proc/electrified_loop()
-	while (secondsElectrified > 0)
+	while (secondsElectrified > NOT_ELECTRIFIED)
 		sleep(10)
 		if(QDELETED(src))
 			return

-		secondsElectrified -= 1
+		secondsElectrified--
 		updateDialog()
 	// This is to protect against changing to permanent, mid loop.
-	if(secondsElectrified==0)
+	if(secondsElectrified == NOT_ELECTRIFIED)
 		set_electrified(NOT_ELECTRIFIED)
 	else
 		set_electrified(ELECTRIFIED_PERMANENT)
@@ -825,8 +825,8 @@

 /obj/machinery/door/airlock/attackby(obj/item/C, mob/user, params)
 	if(!issilicon(user) && !IsAdminGhost(user))
-		if(src.isElectrified())
-			if(src.shock(user, 75))
+		if(isElectrified())
+			if(shock(user, 75))
 				return
 	add_fingerprint(user)

@@ -839,7 +839,7 @@
 						to_chat(user, "<span class='warning'>You need at least 2 metal sheets to reinforce [src].</span>")
 						return
 					to_chat(user, "<span class='notice'>You start reinforcing [src].</span>")
-					if(do_after(user, 20, 1, target = src))
+					if(do_after(user, 20, TRUE, target = src))
 						if(!panel_open || !S.use(2))
 							return
 						user.visible_message("<span class='notice'>[user] reinforces \the [src] with metal.</span>",
@@ -1070,7 +1070,7 @@
 			INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2)

 	if(istype(I, /obj/item/crowbar/power))
-		if(isElectrified())
+		if(hasPower() && isElectrified())
 			shock(user,100)//it's like sticking a forck in a power socket
 			return

@@ -1090,12 +1090,11 @@
 			time_to_open = 50
 			playsound(src, 'sound/machines/airlock_alien_prying.ogg',100,1) //is it aliens or just the CE being a dick?
 			prying_so_hard = TRUE
-			var/result = do_after(user, time_to_open,target = src)
-			prying_so_hard = FALSE
-			if(result)
+			if(do_after(user, time_to_open,target = src))
 				open(2)
 				if(density && !open(2))
 					to_chat(user, "<span class='warning'>Despite your attempts, [src] refuses to open.</span>")
+			prying_so_hard = FALSE

 /obj/machinery/door/airlock/open(forced=0)
 	if( operating || welded || locked )
@@ -1359,12 +1358,25 @@
 		wires.cut_all()
 		update_icon()

-/obj/machinery/door/airlock/proc/set_electrified(seconds)
+/obj/machinery/door/airlock/proc/set_electrified(seconds, mob/user)
 	secondsElectrified = seconds
 	diag_hud_set_electrified()
-	if(secondsElectrified > 0)
+	if(secondsElectrified > NOT_ELECTRIFIED)
 		INVOKE_ASYNC(src, .proc/electrified_loop)

+	if(user)
+		var/message
+		switch(secondsElectrified)
+			if(ELECTRIFIED_PERMANENT)
+				message = "permanently shocked"
+			if(NOT_ELECTRIFIED)
+				message = "unshocked"
+			else
+				message = "temp shocked for [secondsElectrified] seconds"
+		LAZYADD(shockedby, text("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(user)] - ([uppertext(message)])"))
+		log_combat(user, src, message)
+		//add_hiddenprint(user)
+
 /obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
 	if(obj_integrity < (0.75 * max_integrity))
@@ -1438,11 +1450,10 @@
 	else if(istype(note, /obj/item/photo))
 		return "photo"

-/obj/machinery/door/airlock/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)
-	SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/door/airlock/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "AiAirlock", name, 500, 390, master_ui, state)
+		ui = new(user, src, "AiAirlock", name)
 		ui.open()
 	return TRUE

@@ -1450,13 +1461,13 @@
 	var/list/data = list()

 	var/list/power = list()
-	power["main"] = src.secondsMainPowerLost ? 0 : 2 // boolean
-	power["main_timeleft"] = src.secondsMainPowerLost
-	power["backup"] = src.secondsBackupPowerLost ? 0 : 2 // boolean
-	power["backup_timeleft"] = src.secondsBackupPowerLost
+	power["main"] = secondsMainPowerLost ? 0 : 2 // boolean
+	power["main_timeleft"] = secondsMainPowerLost
+	power["backup"] = secondsBackupPowerLost ? 0 : 2 // boolean
+	power["backup_timeleft"] = secondsBackupPowerLost
 	data["power"] = power

-	data["shock"] = secondsElectrified == 0 ? 2 : 0
+	data["shock"] = secondsElectrified == NOT_ELECTRIFIED ? 2 : 0
 	data["shock_timeleft"] = secondsElectrified
 	data["id_scanner"] = !aiDisabledIdScanner
 	data["emergency"] = emergency // access
@@ -1493,14 +1504,14 @@
 				loseMainPower()
 				update_icon()
 			else
-				to_chat(usr, "Main power is already offline.")
+				to_chat(usr, "<span class='warning'>Main power is already offline.</span>")
 			. = TRUE
 		if("disrupt-backup")
 			if(!secondsBackupPowerLost)
 				loseBackupPower()
 				update_icon()
 			else
-				to_chat(usr, "Backup power is already offline.")
+				to_chat(usr, "<span class='warning'>Backup power is already offline.</span>")
 			. = TRUE
 		if("shock-restore")
 			shock_restore(usr)
@@ -1529,7 +1540,6 @@
 			. = TRUE
 		if("speed-toggle")
 			normalspeed = !normalspeed
-
 			. = TRUE
 		if("open-close")
 			user_toggle_open(usr)
@@ -15,11 +15,13 @@
 	. = ..()
 	. += "<span class='notice'>Has a neat <i>selection menu</i> for modifying airlock access levels.</span>"

-/obj/item/electronics/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-													datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/electronics/airlock/ui_state(mob/user)
+	return GLOB.hands_state
+
+/obj/item/electronics/airlock/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "AirlockElectronics", name, 420, 485, master_ui, state)
+		ui = new(user, src, "AirlockElectronics", name)
 		ui.open()

 /obj/item/electronics/airlock/ui_static_data(mob/user)
@@ -140,11 +140,10 @@
 	. = new_time == timer_duration //return 1 on no change
 	timer_duration = new_time

-/obj/machinery/door_timer/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/door_timer/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "BrigTimer", name, 300, 138, master_ui, state)
+		ui = new(user, src, "BrigTimer", name)
 		ui.open()

 //icon update function
@@ -235,7 +234,7 @@
 					preset_time = PRESET_LONG
 			. = set_timer(preset_time)
 			if(timing)
-				activation_time = REALTIMEOFDAY
+				activation_time = world.time
 		else
 			. = FALSE

@@ -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
@@ -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(!secure) //HC.head_call && 
+				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

@@ -201,3 +199,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)
@@ -4,6 +4,15 @@
 #define POPUP_ANIM_TIME 5
 #define POPDOWN_ANIM_TIME 5 //Be sure to change the icon animation at the same time or it'll look bad

+#define TURRET_FLAG_SHOOT_ALL_REACT		(1<<0)	// The turret gets pissed off and shoots at people nearby (unless they have sec access!)
+#define TURRET_FLAG_AUTH_WEAPONS		(1<<1)	// Checks if it can shoot people that have a weapon they aren't authorized to have
+#define TURRET_FLAG_SHOOT_CRIMINALS		(1<<2)	// Checks if it can shoot people that are wanted
+#define TURRET_FLAG_SHOOT_ALL 			(1<<3)  // The turret gets pissed off and shoots at people nearby (unless they have sec access!)
+#define TURRET_FLAG_SHOOT_ANOMALOUS 	(1<<4)  // Checks if it can shoot at unidentified lifeforms (ie xenos)
+#define TURRET_FLAG_SHOOT_UNSHIELDED	(1<<5)	// Checks if it can shoot people that aren't mindshielded and who arent heads
+#define TURRET_FLAG_SHOOT_BORGS			(1<<6)	// checks if it can shoot cyborgs
+#define TURRET_FLAG_SHOOT_HEADS			(1<<7)	// checks if it can shoot at heads of staff
+
 /obj/machinery/porta_turret
 	name = "turret"
 	icon = 'icons/obj/turrets.dmi'
@@ -15,70 +24,79 @@
 	use_power = IDLE_POWER_USE				//this turret uses and requires power
 	idle_power_usage = 50		//when inactive, this turret takes up constant 50 Equipment power
 	active_power_usage = 300	//when active, this turret takes up constant 300 Equipment power
-	req_access = list(ACCESS_SEC_DOORS)
+	req_access = list(ACCESS_SECURITY) /// Only people with Security access
 	power_channel = EQUIP	//drains power from the EQUIPMENT channel
-	speed_process = TRUE
-
-	var/base_icon_state = "standard"
-	var/scan_range = 7
-	var/atom/base = null //for turrets inside other objects
-
-	var/raised = 0			//if the turret cover is "open" and the turret is raised
-	var/raising= 0			//if the turret is currently opening or closing its cover
-
 	max_integrity = 160		//the turret's health
 	integrity_failure = 0.5
 	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
-
-	var/locked = TRUE			//if the turret's behaviour control access is locked
-	var/controllock = FALSE		//if the turret responds to control panels
-
-	var/installation = /obj/item/gun/energy/e_gun/turret		//the type of weapon installed by default
+	/// Base turret icon state
+	var/base_icon_state = "standard"
+	/// Scan range of the turret for locating targets
+	var/scan_range = 7
+	/// For turrets inside other objects
+	var/atom/base = null
+	/// If the turret cover is "open" and the turret is raised
+	var/raised = FALSE
+	/// If the turret is currently opening or closing its cover
+	var/raising = FALSE
+	/// If the turret's behaviour control access is locked
+	var/locked = TRUE
+	/// If the turret responds to control panels
+	var/controllock = FALSE
+	/// The type of weapon installed by default
+	var/installation = /obj/item/gun/energy/e_gun/turret
+	/// What stored gun is in the turret
 	var/obj/item/gun/stored_gun = null
-	var/gun_charge = 0		//the charge of the gun when retrieved from wreckage
-
+	/// The charge of the gun when retrieved from wreckage
+	var/gun_charge = 0
+	/// In which mode is turret in, stun or lethal
 	var/mode = TURRET_STUN
-
-	var/stun_projectile = null		//stun mode projectile type
+	/// Stun mode projectile type
+	var/stun_projectile = null
+	/// Sound of stun projectile
 	var/stun_projectile_sound
-	var/nonlethal_projectile		//projectile to use in stun mode when the target is resting, if any
+	/// Projectile to use in stun mode when the target is resting, if any
+	var/nonlethal_projectile
+	/// Sound of stun projectile wen the target is resting, optional
 	var/nonlethal_projectile_sound
-	var/lethal_projectile = null	//lethal mode projectile type
+	/// Lethal mode projectile type
+	var/lethal_projectile = null
+	/// Sound of lethal projectile
 	var/lethal_projectile_sound
-
-	var/reqpower = 500		//power needed per shot
-	var/always_up = 0		//Will stay active
-	var/has_cover = 1		//Hides the cover
-
-	var/obj/machinery/porta_turret_cover/cover = null	//the cover that is covering this turret
-
-	var/last_fired = 0		//world.time the turret last fired
-	var/shot_delay = 15		//ticks until next shot (1.5 ?)
-	var/shot_stagger = 0		// sleep() shots to stagger attacks
-
-	var/check_records = 1	//checks if it can use the security records
-	var/criminals = 1		//checks if it can shoot people on arrest
-	var/auth_weapons = 0	//checks if it can shoot people that have a weapon they aren't authorized to have
-	var/stun_all = 0		//if this is active, the turret shoots everything that isn't security or head of staff
-	var/check_anomalies = 1	//checks if it can shoot at unidentified lifeforms (ie xenos)
-	var/shoot_unloyal = 0	//checks if it can shoot people that aren't loyalty implantd
-
-	var/attacked = 0		//if set to 1, the turret gets pissed off and shoots at people nearby (unless they have sec access!)
-
-	var/on = TRUE				//determines if the turret is on
-
-	var/list/faction = list("turret") // Same faction mobs will never be shot at, no matter the other settings
-
-	var/datum/effect_system/spark_spread/spark_system	//the spark system, used for generating... sparks?
-
+	/// Power needed per shot
+	var/reqpower = 500
+	/// Will stay active
+	var/always_up = FALSE
+	/// Hides the cover
+	var/has_cover = TRUE
+	/// The cover that is covering this turret
+	var/obj/machinery/porta_turret_cover/cover = null
+	/// World.time the turret last fired
+	var/last_fired = 0
+	/// Ticks until next shot (1.5 ?)
+	var/shot_delay = 15
+	/// Turret flags about who is turret allowed to shoot
+	var/turret_flags = TURRET_FLAG_SHOOT_CRIMINALS | TURRET_FLAG_SHOOT_ANOMALOUS
+	/// Determines if the turret is on
+	var/on = TRUE
+	/// Same faction mobs will never be shot at, no matter the other settings
+	var/list/faction = list("turret")
+	/// The spark system, used for generating... sparks?
+	var/datum/effect_system/spark_spread/spark_system
+	/// Linked turret control panel of the turret
 	var/obj/machinery/turretid/cp = null
-
-	var/wall_turret_direction //The turret will try to shoot from a turf in that direction when in a wall
-
-	var/manual_control = FALSE //
+	/// The turret will try to shoot from a turf in that direction when in a wall
+	var/wall_turret_direction
+	/// If the turret is manually controlled
+	var/manual_control = FALSE
+	/// Action button holder for quitting manual control
 	var/datum/action/turret_quit/quit_action
+	/// Action button holder for switching between turret modes when manually controlling
 	var/datum/action/turret_toggle/toggle_action
+	/// Mob that is remotely controlling the turret
 	var/mob/remote_controller
+	/// MISSING:
+	var/shot_stagger = 0

 /obj/machinery/porta_turret/Initialize()
 	. = ..()
@@ -100,6 +118,27 @@
 	if(!has_cover)
 		INVOKE_ASYNC(src, .proc/popUp)

+/obj/machinery/porta_turret/proc/toggle_on(var/set_to)
+	var/current = on
+	if (!isnull(set_to))
+		on = set_to
+	else
+		on = !on
+	if (current != on)
+		check_should_process()
+		if (!on)
+			popDown()
+
+/obj/machinery/porta_turret/proc/check_should_process()
+	if (datum_flags & DF_ISPROCESSING)
+		if (!on || !anchored || (stat & BROKEN) || !powered())
+			//end_processing()
+			STOP_PROCESSING(SSmachines, src)
+	else
+		if (on && anchored && !(stat & BROKEN) && powered())
+			START_PROCESSING(SSmachines, src)
+			//begin_processing()
+
 /obj/machinery/porta_turret/update_icon_state()
 	if(!anchored)
 		icon_state = "turretCover"
@@ -119,7 +158,6 @@
 		else
 			icon_state = "[base_icon_state]_unpowered"

-
 /obj/machinery/porta_turret/proc/setup(obj/item/gun/turret_gun)
 	if(stored_gun)
 		qdel(stored_gun)
@@ -160,83 +198,88 @@
 	remove_control()
 	return ..()

-/obj/machinery/porta_turret/ui_interact(mob/user)
-	. = ..()
-	var/dat
-	dat += "Status: <a href='?src=[REF(src)];power=1'>[on ? "On" : "Off"]</a><br>"
-	dat += "Behaviour controls are [locked ? "locked" : "unlocked"]<br>"
+/obj/machinery/porta_turret/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "PortableTurret", name)
+		ui.open()

-	if(!locked)
-		dat += "Check for Weapon Authorization: <A href='?src=[REF(src)];operation=authweapon'>[auth_weapons ? "Yes" : "No"]</A><BR>"
-		dat += "Check Security Records: <A href='?src=[REF(src)];operation=checkrecords'>[check_records ? "Yes" : "No"]</A><BR>"
-		dat += "Neutralize Identified Criminals: <A href='?src=[REF(src)];operation=shootcrooks'>[criminals ? "Yes" : "No"]</A><BR>"
-		dat += "Neutralize All Non-Security and Non-Command Personnel: <A href='?src=[REF(src)];operation=shootall'>[stun_all ? "Yes" : "No"]</A><BR>"
-		dat += "Neutralize All Unidentified Life Signs: <A href='?src=[REF(src)];operation=checkxenos'>[check_anomalies ? "Yes" : "No"]</A><BR>"
-		dat += "Neutralize All Non-Loyalty Implanted Personnel: <A href='?src=[REF(src)];operation=checkloyal'>[shoot_unloyal ? "Yes" : "No"]</A><BR>"
+/obj/machinery/porta_turret/ui_data(mob/user)
+	var/list/data = list(
+		"locked" = locked,
+		"on" = on,
+		"check_weapons" = turret_flags & TURRET_FLAG_AUTH_WEAPONS,
+		"neutralize_criminals" = turret_flags & TURRET_FLAG_SHOOT_CRIMINALS,
+		"neutralize_all" = turret_flags & TURRET_FLAG_SHOOT_ALL,
+		"neutralize_unidentified" = turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS,
+		"neutralize_nonmindshielded" = turret_flags & TURRET_FLAG_SHOOT_UNSHIELDED,
+		"neutralize_cyborgs" = turret_flags & TURRET_FLAG_SHOOT_BORGS,
+		"ignore_heads" = turret_flags & TURRET_FLAG_SHOOT_HEADS,
+		"manual_control" = manual_control,
+		"silicon_user" = FALSE,
+		"allow_manual_control" = FALSE,
+		"lasertag_turret" = istype(src, /obj/machinery/porta_turret/lasertag),
+	)
 	if(issilicon(user))
+		data["silicon_user"] = TRUE
 		if(!manual_control)
 			var/mob/living/silicon/S = user
 			if(S.hack_software)
-				dat += "Assume direct control : <a href='?src=[REF(src)];operation=manual'>Manual Control</a><br>"
-		else
-			dat += "Warning! Remote control protocol enabled.<br>"
+				data["allow_manual_control"] = TRUE
+	return data

-
-	var/datum/browser/popup = new(user, "autosec", "Automatic Portable Turret Installation", 300, 300)
-	popup.set_content(dat)
-	popup.open()
-
-/obj/machinery/porta_turret/Topic(href, href_list)
-	if(..())
-		return
-	usr.set_machine(src)
-	add_fingerprint(usr)
-
-	if(href_list["power"] && !locked)
-		if(anchored)	//you can't turn a turret on/off if it's not anchored/secured
-			on = !on	//toggle on/off
-		else
-			to_chat(usr, "<span class='notice'>It has to be secured first!</span>")
-		interact(usr)
+/obj/machinery/porta_turret/ui_act(action, list/params)
+	. = ..()
+	if(.)
 		return

-	if(href_list["operation"])
-		switch(href_list["operation"])	//toggles customizable behavioural protocols
-			if("authweapon")
-				auth_weapons = !auth_weapons
-			if("checkrecords")
-				check_records = !check_records
-			if("shootcrooks")
-				criminals = !criminals
-			if("shootall")
-				stun_all = !stun_all
-			if("checkxenos")
-				check_anomalies = !check_anomalies
-			if("checkloyal")
-				shoot_unloyal = !shoot_unloyal
-			if("manual")
-				if(issilicon(usr) && !manual_control)
-					give_control(usr)
-		interact(usr)
+	switch(action)
+		if("power")
+			if(anchored)
+				toggle_on()
+				return TRUE
+			else
+				to_chat(usr, "<span class='warning'>It has to be secured first!</span>")
+		if("authweapon")
+			turret_flags ^= TURRET_FLAG_AUTH_WEAPONS
+			return TRUE
+		if("shootcriminals")
+			turret_flags ^= TURRET_FLAG_SHOOT_CRIMINALS
+			return TRUE
+		if("shootall")
+			turret_flags ^= TURRET_FLAG_SHOOT_ALL
+			return TRUE
+		if("checkxenos")
+			turret_flags ^= TURRET_FLAG_SHOOT_ANOMALOUS
+			return TRUE
+		if("checkloyal")
+			turret_flags ^= TURRET_FLAG_SHOOT_UNSHIELDED
+			return TRUE
+		if("shootborgs")
+			turret_flags ^= TURRET_FLAG_SHOOT_BORGS
+			return TRUE
+		if("shootheads")
+			turret_flags ^= TURRET_FLAG_SHOOT_HEADS
+			return TRUE
+		if("manual")
+			if(!issilicon(usr))
+				return
+			give_control(usr)
+			return TRUE
+
+/obj/machinery/porta_turret/ui_host(mob/user)
+	if(has_cover && cover)
+		return cover
+	if(base)
+		return base
+	return src

 /obj/machinery/porta_turret/power_change()
-	if(!anchored)
+	. = ..()
+	if(!anchored || (stat & BROKEN) || !powered())
 		update_icon()
 		remove_control()
-		return
-	if(stat & BROKEN)
-		update_icon()
-		remove_control()
-	else
-		if( powered() )
-			stat &= ~NOPOWER
-			update_icon()
-		else
-			spawn(rand(0, 15))
-				stat |= NOPOWER
-				remove_control()
-				update_icon()
-
+	check_should_process()

 /obj/machinery/porta_turret/attackby(obj/item/I, mob/user, params)
 	if(stat & BROKEN)
@@ -284,8 +327,10 @@
 			locked = !locked
 			to_chat(user, "<span class='notice'>Controls are now [locked ? "locked" : "unlocked"].</span>")
 		else
-			to_chat(user, "<span class='notice'>Access denied.</span>")
+			to_chat(user, "<span class='alert'>Access denied.</span>")
 	else if(istype(I, /obj/item/multitool) && !locked)
+		if(!multitool_check_buffer(user, I))
+			return
 		var/obj/item/multitool/M = I
 		M.buffer = src
 		to_chat(user, "<span class='notice'>You add [src] to multitool buffer.</span>")
@@ -293,19 +338,17 @@
 		return ..()

 /obj/machinery/porta_turret/emag_act(mob/user)
-	. = ..()
 	if(obj_flags & EMAGGED)
 		return
 	to_chat(user, "<span class='warning'>You short out [src]'s threat assessment circuits.</span>")
-	visible_message("[src] hums oddly...")
+	audible_message("<span class='hear'>[src] hums oddly...</span>")
 	obj_flags |= EMAGGED
 	controllock = TRUE
-	on = FALSE //turns off the turret temporarily
+	toggle_on(FALSE) //turns off the turret temporarily
 	update_icon()
-	sleep(60) //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
-	on = TRUE //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
-	return TRUE
-
+	//6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
+	addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 6 SECONDS)
+	//turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here

 /obj/machinery/porta_turret/emp_act(severity)
 	. = ..()
@@ -314,63 +357,41 @@
 	if(on)
 		//if the turret is on, the EMP no matter how severe disables the turret for a while
 		//and scrambles its settings, with a slight chance of having an emag effect
-		check_records = pick(0, 1)
-		criminals = pick(0, 1)
-		auth_weapons = pick(0, 1)
-		stun_all = pick(0, 0, 0, 0, 1)	//stun_all is a pretty big deal, so it's least likely to get turned on
+		if(prob(50))
+			turret_flags |= TURRET_FLAG_SHOOT_CRIMINALS
+		if(prob(50))
+			turret_flags |= TURRET_FLAG_AUTH_WEAPONS
+		if(prob(20))
+			turret_flags |= TURRET_FLAG_SHOOT_ALL // Shooting everyone is a pretty big deal, so it's least likely to get turned on

-		on = FALSE
+		toggle_on(FALSE)
 		remove_control()

-		spawn(rand(60,600))
-			if(!on)
-				on = TRUE
+		addtimer(CALLBACK(src, .proc/toggle_on, TRUE), rand(60,600))

 /obj/machinery/porta_turret/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
 	. = ..()
-	if(.) //damage received
+	if(. && obj_integrity > 0) //damage received
 		if(prob(30))
 			spark_system.start()
-		if(on && !attacked && !(obj_flags & EMAGGED))
-			attacked = TRUE
+		if(on && !(turret_flags & TURRET_FLAG_SHOOT_ALL_REACT) && !(obj_flags & EMAGGED))
+			turret_flags |= TURRET_FLAG_SHOOT_ALL_REACT
 			addtimer(CALLBACK(src, .proc/reset_attacked), 60)

 /obj/machinery/porta_turret/proc/reset_attacked()
-	attacked = FALSE
+	turret_flags &= ~TURRET_FLAG_SHOOT_ALL_REACT

 /obj/machinery/porta_turret/deconstruct(disassembled = TRUE)
 	qdel(src)

 /obj/machinery/porta_turret/obj_break(damage_flag)
-	if(!(flags_1 & NODECONSTRUCT_1) && !(stat & BROKEN))
-		stat |= BROKEN	//enables the BROKEN bit
+	. = ..()
+	if(.)
 		power_change()
 		invisibility = 0
 		spark_system.start()	//creates some sparks because they look cool
 		qdel(cover)	//deletes the cover - no need on keeping it there!

-//turret healing
-/obj/machinery/porta_turret/examine(mob/user)
-	. = ..()
-	if(obj_integrity < max_integrity)
-		. += "<span class='notice'>Use a welder to fix it.</span>"
-
-/obj/machinery/porta_turret/welder_act(mob/living/user, obj/item/I)
-	. = TRUE
-	if(obj_integrity < max_integrity)
-		if(!I.tool_start_check(user, amount=0))
-			return
-		user.visible_message("[user] is welding the turret.", \
-						"<span class='notice'>You begin repairing the turret...</span>", \
-						"<span class='italics'>You hear welding.</span>")
-		if(I.use_tool(src, user, 40, volume=50))
-			obj_integrity = max_integrity
-			user.visible_message("[user.name] has repaired [src].", \
-								"<span class='notice'>You finish repairing the turret.</span>")
-	else
-		to_chat(user, "<span class='notice'>The turret doesn't need repairing.</span>")
-
-
 /obj/machinery/porta_turret/process()
 	//the main machinery process
 	if(cover == null && anchored)	//if it has no cover and is anchored
@@ -382,35 +403,43 @@
 				cover.parent_turret = src	//assign the cover its parent_turret, which would be this (src)

 	if(!on || (stat & (NOPOWER|BROKEN)) || manual_control)
-		return
+		return PROCESS_KILL

 	var/list/targets = list()
 	for(var/mob/A in view(scan_range, base))
 		if(A.invisibility > SEE_INVISIBLE_LIVING)
 			continue

-		if(check_anomalies)//if it's set to check for simple animals
+		if(turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS)//if it's set to check for simple animals
 			if(isanimal(A))
 				var/mob/living/simple_animal/SA = A
 				if(SA.stat || in_faction(SA)) //don't target if dead or in faction
 					continue
 				targets += SA
-			if(issilicon(A))
-				var/mob/living/silicon/sillycone = A
-				if(sillycone.stat || in_faction(sillycone))
+				continue
+
+		if(issilicon(A))
+			var/mob/living/silicon/sillycone = A
+
+			if(ispAI(A))
+				continue
+
+			if((turret_flags & TURRET_FLAG_SHOOT_BORGS) && sillycone.stat != DEAD && iscyborg(sillycone))
+				targets += sillycone
+				continue
+
+			if(sillycone.stat || in_faction(sillycone))
+				continue
+
+			if(iscyborg(sillycone))
+				var/mob/living/silicon/robot/sillyconerobot = A
+				if(LAZYLEN(faction) && (ROLE_SYNDICATE in faction) && sillyconerobot.emagged == TRUE)
 					continue

-				if(iscyborg(sillycone))
-					var/mob/living/silicon/robot/sillyconerobot = A
-					if(LAZYLEN(faction) && (ROLE_SYNDICATE in faction) && sillyconerobot.emagged == TRUE)
-						continue
-
-				targets += sillycone
-
-		if(iscarbon(A))
+		else if(iscarbon(A))
 			var/mob/living/carbon/C = A
-			//If not emagged, only target non downed carbons
-			if(mode != TURRET_LETHAL && (C.stat || C.handcuffed || (C.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)))//CIT CHANGE - replaces check for lying with check for recoveringstam
+			//If not emagged, only target carbons that can use items
+			if(mode != TURRET_LETHAL && (C.stat || C.handcuffed || !(C.mobility_flags & MOBILITY_USE)))
 				continue

 			//If emagged, target all but dead carbons
@@ -419,12 +448,13 @@

 			//if the target is a human and not in our faction, analyze threat level
 			if(ishuman(C) && !in_faction(C))
+
 				if(assess_perp(C) >= 4)
 					targets += C
-
-			else if(check_anomalies) //non humans who are not simple animals (xenos etc)
+			else if(turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS) //non humans who are not simple animals (xenos etc)
 				if(!in_faction(C))
 					targets += C
+
 	for(var/A in GLOB.mechas_list)
 		if((get_dist(A, base) < scan_range) && can_see(base, A, scan_range))
 			var/obj/mecha/Mech = A
@@ -432,6 +462,10 @@
 				if(assess_perp(Mech.occupant) >= 4)
 					targets += Mech

+	if((turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS) && GLOB.blobs.len && (mode == TURRET_LETHAL))
+		for(var/obj/structure/blob/B in view(scan_range, base))
+			targets += B
+
 	if(targets.len)
 		tryToShootAt(targets)
 	else if(!always_up)
@@ -488,36 +522,37 @@
 	if(obj_flags & EMAGGED)
 		return 10	//if emagged, always return 10.

-	if((stun_all || attacked) && !allowed(perp))
+	if((turret_flags & (TURRET_FLAG_SHOOT_ALL | TURRET_FLAG_SHOOT_ALL_REACT)) && !allowed(perp))
 		//if the turret has been attacked or is angry, target all non-sec people
 		if(!allowed(perp))
 			return 10

-	if(auth_weapons)	//check for weapon authorization
+	if(turret_flags & TURRET_FLAG_AUTH_WEAPONS)	//check for weapon authorization
 		if(isnull(perp.wear_id) || istype(perp.wear_id.GetID(), /obj/item/card/id/syndicate))

 			if(allowed(perp)) //if the perp has security access, return 0
 				return 0
-
 			if(perp.is_holding_item_of_type(/obj/item/gun) ||  perp.is_holding_item_of_type(/obj/item/melee/baton))
 				threatcount += 4

 			if(istype(perp.belt, /obj/item/gun) || istype(perp.belt, /obj/item/melee/baton))
 				threatcount += 2

-	if(check_records)	//if the turret can check the records, check if they are set to *Arrest* on records
+	if(turret_flags & TURRET_FLAG_SHOOT_CRIMINALS)	//if the turret can check the records, check if they are set to *Arrest* on records
 		var/perpname = perp.get_face_name(perp.get_id_name())
 		var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.security)
 		if(!R || (R.fields["criminal"] == "*Arrest*"))
 			threatcount += 4

-	if(shoot_unloyal)
-		if (!HAS_TRAIT(perp, TRAIT_MINDSHIELD))
-			threatcount += 4
+	if((turret_flags & TURRET_FLAG_SHOOT_UNSHIELDED) && (!HAS_TRAIT(perp, TRAIT_MINDSHIELD)))
+		threatcount += 4
+
+	// If we aren't shooting heads then return a threatcount of 0
+	if (!(turret_flags & TURRET_FLAG_SHOOT_HEADS) && (perp.get_assignment() in GLOB.command_positions))
+		return 0

 	return threatcount

-
 /obj/machinery/porta_turret/proc/in_faction(mob/target)
 	for(var/faction1 in faction)
 		if(faction1 in target.faction)
@@ -563,15 +598,14 @@
 					T = closer
 					break

-	var/mob/living/carbon/C
-	if(iscarbon(target))
-		C = target
-
 	update_icon()
 	var/obj/item/projectile/A
 	//any emagged turrets drains 2x power and uses a different projectile?
 	if(mode == TURRET_STUN)
-		if(nonlethal_projectile && C && C.resting)
+		var/mob/living/carbon/C = null
+		if(iscarbon(target))
+			C = target
+		if(nonlethal_projectile && C?.resting)
 			use_power(reqpower*0.5)
 			A = new nonlethal_projectile(T)
 			playsound(loc, nonlethal_projectile_sound, 75, 1)
@@ -582,7 +616,7 @@
 	else
 		use_power(reqpower * 2)
 		A = new lethal_projectile(T)
-		playsound(loc, lethal_projectile_sound, 75, 1)
+		playsound(loc, lethal_projectile_sound, 75, TRUE)


 	//Shooting Code:
@@ -592,16 +626,15 @@
 	A.fire()
 	return A

-/obj/machinery/porta_turret/proc/setState(on, mode)
+/obj/machinery/porta_turret/proc/setState(on, mode, shoot_cyborgs)
 	if(controllock)
 		return
-	src.on = on
-	if(!on)
-		popDown()
+
+	shoot_cyborgs ? (turret_flags |= TURRET_FLAG_SHOOT_BORGS) : (turret_flags &= ~TURRET_FLAG_SHOOT_BORGS)
+	toggle_on(on)
 	src.mode = mode
 	power_change()

-
 /datum/action/turret_toggle
 	name = "Toggle Mode"
 	icon_icon = 'icons/mob/actions/actions_mecha.dmi'
@@ -685,7 +718,15 @@

 /obj/machinery/porta_turret/syndicate/ComponentInitialize()
 	. = ..()
-	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+	// AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) //this one or ^ one?
+
+
+/obj/machinery/porta_turret/syndicate/setup()
+	return
+
+/obj/machinery/porta_turret/syndicate/assess_perp(mob/living/carbon/human/perp)
+	return 10 //Syndicate turrets shoot everything not in their faction

 /obj/machinery/porta_turret/syndicate/energy
 	icon_state = "standard_stun"
@@ -698,7 +739,6 @@
 	lethal_projectile_sound = 'sound/weapons/laser.ogg'
 	desc = "An energy blaster auto-turret."

-
 /obj/machinery/porta_turret/syndicate/energy/heavy
 	icon_state = "standard_stun"
 	base_icon_state = "standard"
@@ -715,14 +755,13 @@
 	integrity_failure = 0.08
 	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)

-
-/obj/machinery/porta_turret/syndicate/setup()
-	return
-
-/obj/machinery/porta_turret/syndicate/assess_perp(mob/living/carbon/human/perp)
-	return 10 //Syndicate turrets shoot everything not in their faction
+/obj/machinery/porta_turret/syndicate/energy/raven
+	stun_projectile =  /obj/item/projectile/beam/laser
+	stun_projectile_sound = 'sound/weapons/laser.ogg'
+	faction = list("neutral","silicon","turret")

 /obj/machinery/porta_turret/syndicate/pod
+	integrity_failure = 0.5
 	max_integrity = 40
 	stun_projectile = /obj/item/projectile/bullet/syndicate_turret
 	lethal_projectile = /obj/item/projectile/bullet/syndicate_turret
@@ -749,6 +788,7 @@
 	faction = list("silicon")
 	nonlethal_projectile = /obj/item/projectile/beam/disabler
 	nonlethal_projectile_sound = 'sound/weapons/taser2.ogg'
+	turret_flags = TURRET_FLAG_SHOOT_CRIMINALS | TURRET_FLAG_SHOOT_ANOMALOUS | TURRET_FLAG_SHOOT_HEADS

 /obj/machinery/porta_turret/ai/assess_perp(mob/living/carbon/human/perp)
 	return 10 //AI turrets shoot at everything not in their faction
@@ -804,6 +844,7 @@

 /obj/machinery/porta_turret/centcom_shuttle/weak
 	max_integrity = 120
+	integrity_failure = 0.5
 	name = "Old Laser Turret"
 	desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else."
 	stun_projectile = /obj/item/projectile/beam/weak/penetrator
@@ -817,7 +858,6 @@
 	stun_projectile_sound = 'sound/weapons/gunshot.ogg'
 	desc = "A ballistic machine gun auto-turret."

-
 ////////////////////////
 //Turret Control Panel//
 ////////////////////////
@@ -828,14 +868,22 @@
 	icon = 'icons/obj/machines/turret_control.dmi'
 	icon_state = "control_standby"
 	density = FALSE
-	var/enabled = 1
-	var/lethal = 0
-	var/locked = TRUE
-	var/control_area = null //can be area name, path or nothing.
-	var/ailock = 0 // AI cannot use this
 	req_access = list(ACCESS_AI_UPLOAD)
-	var/list/obj/machinery/porta_turret/turrets = list()
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	/// Variable dictating if linked turrets are active and will shoot targets
+	var/enabled = TRUE
+	/// Variable dictating if linked turrets will shoot lethal projectiles
+	var/lethal = FALSE
+	/// Variable dictating if the panel is locked, preventing changes to turret settings
+	var/locked = TRUE
+	 /// An area in which linked turrets are located, it can be an area name, path or nothing
+	var/control_area = null
+	 /// AI is unable to use this machine if set to TRUE
+	var/ailock = FALSE
+	/// Variable dictating if linked turrets will shoot cyborgs
+	var/shoot_cyborgs = FALSE
+	/// List of all linked turrets
+	var/list/turrets = list()

 /obj/machinery/turretid/Initialize(mapload, ndir = 0, built = 0)
 	. = ..()
@@ -868,112 +916,111 @@
 		T.cp = src

 /obj/machinery/turretid/examine(mob/user)
-	. = ..()
-	if(hasSiliconAccessInArea(user) && (!stat & BROKEN))
-		. += "<span class='notice'>Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets.</span>"
-		. += "<span class='notice'>Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"].</span>"
+	. += ..()
+	if(issilicon(user) && !(stat & BROKEN))
+		. += {"<span class='notice'>Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets.</span>
+					<span class='notice'>Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"].</span>"}

 /obj/machinery/turretid/attackby(obj/item/I, mob/user, params)
 	if(stat & BROKEN)
 		return

 	if (istype(I, /obj/item/multitool))
+		if(!multitool_check_buffer(user, I))
+			return
 		var/obj/item/multitool/M = I
 		if(M.buffer && istype(M.buffer, /obj/machinery/porta_turret))
 			turrets |= M.buffer
-			to_chat(user, "You link \the [M.buffer] with \the [src]")
+			to_chat(user, "<span class='notice'>You link \the [M.buffer] with \the [src].</span>")
 			return

-	if (hasSiliconAccessInArea(user))
+	if (issilicon(user))
 		return attack_hand(user)

 	if ( get_dist(src, user) == 0 )		// trying to unlock the interface
 		if (allowed(usr))
 			if(obj_flags & EMAGGED)
-				to_chat(user, "<span class='notice'>The turret control is unresponsive.</span>")
+				to_chat(user, "<span class='warning'>The turret control is unresponsive!</span>")
 				return

 			locked = !locked
 			to_chat(user, "<span class='notice'>You [ locked ? "lock" : "unlock"] the panel.</span>")
-			if (locked)
-				if (user.machine==src)
-					user.unset_machine()
-					user << browse(null, "window=turretid")
-			else
-				if (user.machine==src)
-					attack_hand(user)
 		else
-			to_chat(user, "<span class='warning'>Access denied.</span>")
+			to_chat(user, "<span class='alert'>Access denied.</span>")

 /obj/machinery/turretid/emag_act(mob/user)
-	. = ..()
 	if(obj_flags & EMAGGED)
 		return
-	to_chat(user, "<span class='danger'>You short out the turret controls' access analysis module.</span>")
+	to_chat(user, "<span class='notice'>You short out the turret controls' access analysis module.</span>")
 	obj_flags |= EMAGGED
 	locked = FALSE
-	if(user && user.machine == src)
-		attack_hand(user)
-	return TRUE

 /obj/machinery/turretid/attack_ai(mob/user)
 	if(!ailock || IsAdminGhost(user))
 		return attack_hand(user)
 	else
-		to_chat(user, "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>")
+		to_chat(user, "<span class='warning'>There seems to be a firewall preventing you from accessing this device!</span>")

-/obj/machinery/turretid/ui_interact(mob/user)
+/obj/machinery/turretid/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "TurretControl", name)
+		ui.open()
+
+/obj/machinery/turretid/ui_data(mob/user)
+	var/list/data = list()
+	data["locked"] = locked
+	data["siliconUser"] = hasSiliconAccessInArea(user) || IsAdminGhost(user)
+	data["enabled"] = enabled
+	data["lethal"] = lethal
+	data["shootCyborgs"] = shoot_cyborgs
+	return data
+
+/obj/machinery/turretid/ui_act(action, list/params)
 	. = ..()
-	if ( get_dist(src, user) > 0 )
-		if ( !(hasSiliconAccessInArea(user) || IsAdminGhost(user)) )
-			to_chat(user, "<span class='notice'>You are too far away.</span>")
-			user.unset_machine()
-			user << browse(null, "window=turretid")
-			return
-
-	var/t = ""
-
-	if(locked && !(hasSiliconAccessInArea(user) || IsAdminGhost(user)))
-		t += "<div class='notice icon'>Swipe ID card to unlock interface</div>"
-	else
-		if(!hasSiliconAccessInArea(user) && !IsAdminGhost(user))
-			t += "<div class='notice icon'>Swipe ID card to lock interface</div>"
-		t += "Turrets [enabled?"activated":"deactivated"] - <A href='?src=[REF(src)];toggleOn=1'>[enabled?"Disable":"Enable"]?</a><br>"
-		t += "Currently set for [lethal?"lethal":"stun repeatedly"] - <A href='?src=[REF(src)];toggleLethal=1'>Change to [lethal?"Stun repeatedly":"Lethal"]?</a><br>"
-
-	var/datum/browser/popup = new(user, "turretid", "Turret Control Panel ([get_area_name(src, TRUE)])")
-	popup.set_content(t)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-
-/obj/machinery/turretid/Topic(href, href_list)
-	if(..())
+	if(.)
 		return
-	if (locked)
-		if(!(hasSiliconAccessInArea(usr) || IsAdminGhost(usr)))
-			to_chat(usr, "Control panel is locked!")
-			return
-	if (href_list["toggleOn"])
-		toggle_on()
-	else if (href_list["toggleLethal"])
-		toggle_lethal()
-	attack_hand(usr)

-/obj/machinery/turretid/proc/toggle_lethal()
+	switch(action)
+		if("lock")
+			if(!hasSiliconAccessInArea(usr) || IsAdminGhost(usr))
+				return
+			if((obj_flags & EMAGGED) || (stat & BROKEN))
+				to_chat(usr, "<span class='warning'>The turret control is unresponsive!</span>")
+				return
+			locked = !locked
+			return TRUE
+		if("power")
+			toggle_on(usr)
+			return TRUE
+		if("mode")
+			toggle_lethal(usr)
+			return TRUE
+		if("shoot_silicons")
+			shoot_silicons(usr)
+			return TRUE
+
+/obj/machinery/turretid/proc/toggle_lethal(mob/user)
 	lethal = !lethal
+	add_hiddenprint(user)
+	log_combat(user, src, "[lethal ? "enabled" : "disabled"] lethals on")
 	updateTurrets()

-/obj/machinery/turretid/proc/toggle_on()
+/obj/machinery/turretid/proc/toggle_on(mob/user)
 	enabled = !enabled
+	add_hiddenprint(user)
+	log_combat(user, src, "[enabled ? "enabled" : "disabled"]")
+	updateTurrets()
+
+/obj/machinery/turretid/proc/shoot_silicons(mob/user)
+	shoot_cyborgs = !shoot_cyborgs
+	add_hiddenprint(user)
+	log_combat(user, src, "[shoot_cyborgs ? "Shooting Borgs" : "Not Shooting Borgs"]")
 	updateTurrets()

 /obj/machinery/turretid/proc/updateTurrets()
 	for (var/obj/machinery/porta_turret/aTurret in turrets)
-		aTurret.setState(enabled, lethal)
-	update_icon()
-
-/obj/machinery/turretid/power_change()
-	..()
+		aTurret.setState(enabled, lethal, shoot_cyborgs)
 	update_icon()

 /obj/machinery/turretid/update_icon_state()
@@ -1051,11 +1098,7 @@

 /obj/machinery/porta_turret/lasertag
 	req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE)
-	check_records = 0
-	criminals = 0
-	auth_weapons = 1
-	stun_all = 0
-	check_anomalies = 0
+	turret_flags = TURRET_FLAG_AUTH_WEAPONS
 	var/team_color

 /obj/machinery/porta_turret/lasertag/assess_perp(mob/living/carbon/human/perp)
@@ -1083,20 +1126,14 @@
 	if(properties["team_color"])
 		team_color = properties["team_color"]

-/obj/machinery/porta_turret/lasertag/ui_interact(mob/user)
-	. = ..()
+/obj/machinery/porta_turret/lasertag/ui_status(mob/user)
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		if(team_color == "blue" && istype(H.wear_suit, /obj/item/clothing/suit/redtag))
-			return
+			return UI_CLOSE
 		if(team_color == "red" && istype(H.wear_suit, /obj/item/clothing/suit/bluetag))
-			return
-
-	var/dat = "Status: <a href='?src=[REF(src)];power=1'>[on ? "On" : "Off"]</a>"
-
-	var/datum/browser/popup = new(user, "autosec", "Automatic Portable Turret Installation", 300, 300)
-	popup.set_content(dat)
-	popup.open()
+			return UI_CLOSE
+	return ..()

 //lasertag presets
 /obj/machinery/porta_turret/lasertag/red
@@ -1112,11 +1149,9 @@
 	if(on)
 		if(team_color == "blue")
 			if(istype(P, /obj/item/projectile/beam/lasertag/redtag))
-				on = FALSE
-				spawn(100)
-					on = TRUE
+				toggle_on(FALSE)
+				addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS)
 		else if(team_color == "red")
 			if(istype(P, /obj/item/projectile/beam/lasertag/bluetag))
-				on = FALSE
-				spawn(100)
-					on = TRUE
+				toggle_on(FALSE)
+				addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS)
@@ -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(.)
@@ -377,11 +377,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()
@@ -17,11 +17,10 @@
 	var/notice = ""
 	var/universal_translate = FALSE // set to TRUE(1) if it can translate nonhuman speech	

-/obj/machinery/computer/telecomms/server/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/telecomms/server/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, ui_key, "TelecommsLogBrowser", "Telecomms Server Monitor", 575, 400, master_ui, state)
+		ui = new(user, src, "TelecommsLogBrowser", "Telecomms Server Monitor")
 		ui.open()

 /obj/machinery/computer/telecomms/server/ui_data(mob/user)
@@ -36,12 +36,11 @@

 	light_color = LIGHT_COLOR_GREEN

-/obj/machinery/computer/message_monitor/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/message_monitor/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)

 	if(!ui)
-		ui = new(user, src, ui_key, "TelecommsPDALog", name, 727, 510, master_ui, state)
+		ui = new(user, src, "TelecommsPDALog", name)
 		ui.open()

 /obj/machinery/computer/message_monitor/ui_static_data(mob/user)
@@ -17,12 +17,11 @@

 	circuit = /obj/item/circuitboard/computer/comm_monitor

-/obj/machinery/computer/telecomms/monitor/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/telecomms/monitor/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)

 	if(!ui)
-		ui = new(user, src, ui_key, "TelecommsMonitor", name, 575, 400, master_ui, state)
+		ui = new(user, src, "TelecommsMonitor", name)
 		ui.open()

 /obj/machinery/computer/telecomms/monitor/ui_data(mob/user)
@@ -27,16 +27,15 @@
 	else
 		return ..()

-/obj/machinery/telecomms/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)
+/obj/machinery/telecomms/ui_interact(mob/user, datum/tgui/ui)
 	if(!canInteract(user))
 		if(ui)
 			ui.close() //haha no.
 		return
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	ui = SStgui.try_update_ui(user, src, ui)

 	if(!ui)
-		ui = new(user, src, ui_key, "TelecommsInteraction", "[name] Access", 520, 500, master_ui, state)
+		ui = new(user, src, "TelecommsInteraction", "[name] Access")
 		ui.open()

 /obj/machinery/telecomms/ui_data(mob/user)