Merge remote-tracking branch 'citadel/master' into unarmed_parry

code/game/machinery/computer/Operating.dm

@@ -46,7 +46,7 @@
 /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)
 	if(!ui)
-		ui = new(user, src, ui_key, "operating_computer", name, 350, 470, master_ui, state)
+		ui = new(user, src, ui_key, "OperatingComputer", name, 350, 470, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/operating/ui_data(mob/user)
@@ -108,6 +108,49 @@
 					))
 		else
 			data["patient"] = null
+			return data
+	switch(patient.stat)
+		if(CONSCIOUS)
+			data["patient"]["stat"] = "Conscious"
+			data["patient"]["statstate"] = "good"
+		if(SOFT_CRIT)
+			data["patient"]["stat"] = "Conscious"
+			data["patient"]["statstate"] = "average"
+		if(UNCONSCIOUS)
+			data["patient"]["stat"] = "Unconscious"
+			data["patient"]["statstate"] = "average"
+		if(DEAD)
+			data["patient"]["stat"] = "Dead"
+			data["patient"]["statstate"] = "bad"
+	data["patient"]["health"] = patient.health
+	data["patient"]["blood_type"] = patient.dna.blood_type
+	data["patient"]["maxHealth"] = patient.maxHealth
+	data["patient"]["minHealth"] = HEALTH_THRESHOLD_DEAD
+	data["patient"]["bruteLoss"] = patient.getBruteLoss()
+	data["patient"]["fireLoss"] = patient.getFireLoss()
+	data["patient"]["toxLoss"] = patient.getToxLoss()
+	data["patient"]["oxyLoss"] = patient.getOxyLoss()
+	data["procedures"] = list()
+	if(patient.surgeries.len)
+		for(var/datum/surgery/procedure in patient.surgeries)
+			var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
+			var/chems_needed = surgery_step.get_chem_list()
+			var/alternative_step
+			var/alt_chems_needed = ""
+			if(surgery_step.repeatable)
+				var/datum/surgery_step/next_step = procedure.get_surgery_next_step()
+				if(next_step)
+					alternative_step = capitalize(next_step.name)
+					alt_chems_needed = next_step.get_chem_list()
+				else
+					alternative_step = "Finish operation"
+			data["procedures"] += list(list(
+				"name" = capitalize("[parse_zone(procedure.location)] [procedure.name]"),
+				"next_step" = capitalize(surgery_step.name),
+				"chems_needed" = chems_needed,
+				"alternative_step" = alternative_step,
+				"alt_chems_needed" = alt_chems_needed
+			))
 	return data
 
 /obj/machinery/computer/operating/ui_act(action, params)

code/game/machinery/computer/aifixer.dm

@@ -8,6 +8,8 @@
 	icon_keyboard = "tech_key"
 	icon_screen = "ai-fixer"
 	light_color = LIGHT_COLOR_PINK
+	ui_x = 370
+	ui_y = 360
 
 /obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params)
 	if(occupier && istype(I, /obj/item/screwdriver))
@@ -18,8 +20,12 @@
 	else
 		return ..()
 
-/obj/machinery/computer/aifixer/ui_interact(mob/user)
-	. = ..()
+/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)
+	if(!ui)
+		ui = new(user, src, ui_key, "AiRestorer", name, ui_x, ui_y, master_ui, state)
+		ui.open()
 
 	var/dat = ""
 

code/game/machinery/computer/arcade.dm

@@ -136,3 +136,17 @@
 		empprize = pickweight(prizes)
 		new empprize(loc)
 	explosion(loc, -1, 0, 1+num_of_prizes, flame_range = 1+num_of_prizes)
+
+/obj/machinery/computer/arcade/attackby(obj/item/O, mob/user, params)
+	if(istype(O, /obj/item/stack/arcadeticket))
+		var/obj/item/stack/arcadeticket/T = O
+		var/amount = T.get_amount()
+		if(amount <2)
+			to_chat(user, "<span class='warning'>You need 2 tickets to claim a prize!</span>")
+			return
+		prizevend(user)
+		T.pay_tickets()
+		T.update_icon()
+		O = T
+		to_chat(user, "<span class='notice'>You turn in 2 tickets to the [src] and claim a prize!</span>")
+		return

code/game/machinery/computer/arcade/battle.dm

@@ -184,6 +184,15 @@
 	blocked = FALSE
 	return
 
+/obj/machinery/computer/arcade/battle/examine_more(mob/user)
+	to_chat(user, "<span class='notice'>Scribbled on the side of the Arcade Machine you notice some writing...\
+	\nmagical -> >=50 power\
+	\nsmart -> defend, defend, light attack\
+	\nshotgun -> defend, defend, power attack\
+	\nshort temper -> counter, counter, counter\
+	\npoisonous -> light attack, light attack, light attack\
+	\nchonker -> power attack, power attack, power attack</span>")
+	return ..()
 
 /obj/machinery/computer/arcade/battle/emag_act(mob/user)
 	. = ..()

code/game/machinery/computer/atmos_alert.dm

@@ -23,7 +23,7 @@
 									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, "atmos_alert", name, 350, 300, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosAlertConsole", name, 350, 300, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/atmos_alert/ui_data(mob/user)

code/game/machinery/computer/atmos_control.dm

@@ -53,14 +53,14 @@
 			"id_tag" = id_tag,
 			"timestamp" = world.time,
 			"pressure" = air_sample.return_pressure(),
-			"temperature" = air_sample.temperature,
+			"temperature" = air_sample.return_temperature(),
 			"gases" = list()
 		))
 		var/total_moles = air_sample.total_moles()
 		if(total_moles)
-			for(var/gas_id in air_sample.gases)
+			for(var/gas_id in air_sample.get_gases())
 				var/gas_name = GLOB.meta_gas_names[gas_id]
-				signal.data["gases"][gas_name] = air_sample.gases[gas_id] / total_moles * 100
+				signal.data["gases"][gas_name] = air_sample.get_moles(gas_id) / total_moles * 100
 
 		radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
@@ -127,7 +127,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
 									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, "atmos_control", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosControlConsole", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/atmos_control/ui_data(mob/user)
@@ -269,7 +269,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
 									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, "atmos_control", name, ui_x, ui_y, master_ui, state)
+		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)

code/game/machinery/computer/camera.dm

@@ -4,109 +4,166 @@
 	icon_screen = "cameras"
 	icon_keyboard = "security_key"
 	circuit = /obj/item/circuitboard/computer/security
-	var/last_pic = 1
-	var/list/network = list("ss13")
-	var/list/watchers = list() //who's using the console, associated with the camera they're on.
-
 	light_color = LIGHT_COLOR_RED
+	ui_x = 870
+	ui_y = 708
+
+	var/list/network = list("ss13")
+	var/obj/machinery/camera/active_camera
+	var/list/concurrent_users = list()
+
+	// Stuff needed to render the map
+	var/map_name
+	var/const/default_map_size = 15
+	var/obj/screen/cam_screen
+	var/obj/screen/plane_master/lighting/cam_plane_master
+	var/obj/screen/background/cam_background
 
 /obj/machinery/computer/security/Initialize()
 	. = ..()
+	// Map name has to start and end with an A-Z character,
+	// and definitely NOT with a square bracket or even a number.
+	// I wasted 6 hours on this. :agony:
+	map_name = "camera_console_[REF(src)]_map"
+	// Convert networks to lowercase
 	for(var/i in network)
 		network -= i
 		network += lowertext(i)
-
-/obj/machinery/computer/security/check_eye(mob/user)
-	if(!can_interact(user) || !(user in watchers) || !watchers[user])
-		user.unset_machine()
-		return
-	var/obj/machinery/camera/C = watchers[user]
-	if(!C.can_use())
-		user.unset_machine()
-		return
-
-/obj/machinery/computer/security/on_unset_machine(mob/user)
-	watchers.Remove(user)
-	user.reset_perspective(null)
+	// Initialize map objects
+	cam_screen = new
+	cam_screen.name = "screen"
+	cam_screen.assigned_map = map_name
+	cam_screen.del_on_map_removal = FALSE
+	cam_screen.screen_loc = "[map_name]:1,1"
+	cam_plane_master = new
+	cam_plane_master.name = "plane_master"
+	cam_plane_master.assigned_map = map_name
+	cam_plane_master.del_on_map_removal = FALSE
+	cam_plane_master.screen_loc = "[map_name]:CENTER"
+	cam_background = new
+	cam_background.assigned_map = map_name
+	cam_background.del_on_map_removal = FALSE
 
 /obj/machinery/computer/security/Destroy()
-	if(watchers.len)
-		for(var/mob/M in watchers)
-			M.unset_machine() //to properly reset the view of the users if the console is deleted.
+	qdel(cam_screen)
+	qdel(cam_plane_master)
+	qdel(cam_background)
 	return ..()
 
-/obj/machinery/computer/security/can_interact(mob/user)
-	if((!hasSiliconAccessInArea(user) && !Adjacent(user)) || is_blind(user) || !in_view_range(user, src))
-		return FALSE
-	return ..()
+/obj/machinery/computer/security/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
+	for(var/i in network)
+		network -= i
+		network += "[idnum][i]"
 
-/obj/machinery/computer/security/interact(mob/user, special_state)
+/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)
+	// Update UI
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	// Show static if can't use the camera
+	if(!active_camera?.can_use())
+		show_camera_static()
+	if(!ui)
+		var/user_ref = REF(user)
+		var/is_living = isliving(user)
+		// Ghosts shouldn't count towards concurrent users, which produces
+		// an audible terminal_on click.
+		if(is_living)
+			concurrent_users += user_ref
+		// Turn on the console
+		if(length(concurrent_users) == 1 && is_living)
+			playsound(src, 'sound/machines/terminal_on.ogg', 25, FALSE)
+			use_power(active_power_usage)
+		// Register map objects
+		user.client.register_map_obj(cam_screen)
+		user.client.register_map_obj(cam_plane_master)
+		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.open()
+
+/obj/machinery/computer/security/ui_data()
+	var/list/data = list()
+	data["network"] = network
+	data["activeCamera"] = null
+	if(active_camera)
+		data["activeCamera"] = list(
+			name = active_camera.c_tag,
+			status = active_camera.status,
+		)
+	return data
+
+/obj/machinery/computer/security/ui_static_data()
+	var/list/data = list()
+	data["mapRef"] = map_name
+	var/list/cameras = get_available_cameras()
+	data["cameras"] = list()
+	for(var/i in cameras)
+		var/obj/machinery/camera/C = cameras[i]
+		data["cameras"] += list(list(
+			name = C.c_tag,
+		))
+	return data
+
+/obj/machinery/computer/security/ui_act(action, params)
 	. = ..()
-	if (ismob(user) && !isliving(user)) // ghosts don't need cameras
-		return
-	if (!network)
-		stack_trace("No camera network")
-		user.unset_machine()
-		return FALSE
-	if (!(islist(network)))
-		stack_trace("Camera network is not a list")
-		user.unset_machine()
-		return FALSE
-
-	var/list/camera_list = get_available_cameras()
-	if(!(user in watchers))
-		for(var/Num in camera_list)
-			var/obj/machinery/camera/CAM = camera_list[Num]
-			if(istype(CAM) && CAM.can_use())
-				watchers[user] = CAM //let's give the user the first usable camera, and then let him change to the camera he wants.
-				break
-		if(!(user in watchers))
-			user.unset_machine() // no usable camera on the network, we disconnect the user from the computer.
-			return FALSE
-	playsound(src, 'sound/machines/terminal_prompt.ogg', 25, 0)
-	use_camera_console(user)
-
-/obj/machinery/computer/security/proc/use_camera_console(mob/user)
-	var/list/camera_list = get_available_cameras()
-	var/t = input(user, "Which camera should you change to?") as null|anything in camera_list
-	if(!src || user.machine != src) //while we were choosing we got disconnected from our computer or are using another machine.
-		return
-	if(!t || t == "Cancel")
-		user.unset_machine()
-		playsound(src, 'sound/machines/terminal_off.ogg', 25, 0)
+	if(.)
 		return
 
-	var/obj/machinery/camera/C = camera_list[t]
+	if(action == "switch_camera")
+		var/c_tag = params["name"]
+		var/list/cameras = get_available_cameras()
+		var/obj/machinery/camera/C = cameras[c_tag]
+		active_camera = C
+		playsound(src, get_sfx("terminal_type"), 25, FALSE)
 
-	if(!C || !C.can_use() || !can_interact(user))
-		user.unset_machine()
-		return FALSE
+		// Show static if can't use the camera
+		if(!active_camera?.can_use())
+			show_camera_static()
+			return TRUE
 
-	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
-	if(isAI(user))
-		var/mob/living/silicon/ai/A = user
-		A.eyeobj.setLoc(get_turf(C))
-		A.client.eye = A.eyeobj
-	else
-		user.reset_perspective(C)
-		user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
-		user.clear_fullscreen("flash", 5)
-	watchers[user] = C
-	use_power(50)
-	addtimer(CALLBACK(src, .proc/use_camera_console, user), 5)
+		var/list/visible_turfs = list()
+		for(var/turf/T in (C.isXRay() \
+				? range(C.view_range, C) \
+				: view(C.view_range, C)))
+			visible_turfs += T
 
-//returns the list of cameras accessible from this computer
+		var/list/bbox = get_bbox_of_atoms(visible_turfs)
+		var/size_x = bbox[3] - bbox[1] + 1
+		var/size_y = bbox[4] - bbox[2] + 1
+
+		cam_screen.vis_contents = visible_turfs
+		cam_background.icon_state = "clear"
+		cam_background.fill_rect(1, 1, size_x, size_y)
+
+		return TRUE
+
+/obj/machinery/computer/security/ui_close(mob/user)
+	var/user_ref = REF(user)
+	var/is_living = isliving(user)
+	// Living creature or not, we remove you anyway.
+	concurrent_users -= user_ref
+	// Unregister map objects
+	user.client.clear_map(map_name)
+	// Turn off the console
+	if(length(concurrent_users) == 0 && is_living)
+		active_camera = null
+		playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
+		use_power(0)
+
+/obj/machinery/computer/security/proc/show_camera_static()
+	cam_screen.vis_contents.Cut()
+	cam_background.icon_state = "scanline2"
+	cam_background.fill_rect(1, 1, default_map_size, default_map_size)
+
+// Returns the list of cameras accessible from this computer
 /obj/machinery/computer/security/proc/get_available_cameras()
 	var/list/L = list()
 	for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
 		if((is_away_level(z) || is_away_level(C.z)) && (C.z != z))//if on away mission, can only receive feed from same z_level cameras
 			continue
 		L.Add(C)
-
-	camera_sort(L)
-
 	var/list/D = list()
-	D["Cancel"] = "Cancel"
 	for(var/obj/machinery/camera/C in L)
 		if(!C.network)
 			stack_trace("Camera in a cameranet has no camera network")
@@ -114,9 +171,9 @@
 		if(!(islist(C.network)))
 			stack_trace("Camera in a cameranet has a non-list camera network")
 			continue
-		var/list/tempnetwork = C.network&network
+		var/list/tempnetwork = C.network & network
 		if(tempnetwork.len)
-			D["[C.c_tag][(C.status ? null : " (Deactivated)")]"] = C
+			D["[C.c_tag]"] = C
 	return D
 
 // SECURITY MONITORS
@@ -127,7 +184,6 @@
 	icon_state = "television"
 	icon_keyboard = null
 	icon_screen = "detective_tv"
-	clockwork = TRUE //it'd look weird
 	pass_flags = PASSTABLE
 
 /obj/machinery/computer/security/mining
@@ -145,7 +201,7 @@
 	circuit = /obj/item/circuitboard/computer/research
 
 /obj/machinery/computer/security/hos
-	name = "Head of Security's camera console"
+	name = "\improper Head of Security's camera console"
 	desc = "A custom security console with added access to the labor camp network."
 	network = list("ss13", "labor")
 	circuit = null
@@ -157,7 +213,7 @@
 	circuit = null
 
 /obj/machinery/computer/security/qm
-	name = "Quartermaster's camera console"
+	name = "\improper Quartermaster's camera console"
 	desc = "A console with access to the mining, auxillary base and vault camera networks."
 	network = list("mine", "auxbase", "vault")
 	circuit = null
@@ -172,7 +228,6 @@
 	network = list("thunder")
 	density = FALSE
 	circuit = null
-	clockwork = TRUE //it'd look very weird
 	light_power = 0
 
 /obj/machinery/computer/security/telescreen/Initialize()
@@ -190,11 +245,35 @@
 	name = "entertainment monitor"
 	desc = "Damn, they better have the /tg/ channel on these things."
 	icon = 'icons/obj/status_display.dmi'
-	icon_state = "entertainment"
+	icon_state = "entertainment_blank"
 	network = list("thunder")
+	density = FALSE
+	circuit = null
+	interaction_flags_atom = NONE  // interact() is called by BigClick()
+	var/icon_state_off = "entertainment_blank"
+	var/icon_state_on = "entertainment"
+
+/obj/machinery/computer/security/telescreen/entertainment/Initialize()
+	. = ..()
+	RegisterSignal(src, COMSIG_CLICK, .proc/BigClick)
+
+// Bypass clickchain to allow humans to use the telescreen from a distance
+/obj/machinery/computer/security/telescreen/entertainment/proc/BigClick()
+	interact(usr)
+
+/obj/machinery/computer/security/telescreen/entertainment/proc/notify(on)
+	if(on && icon_state == icon_state_off)
+		say(pick(
+			"Feats of bravery live now at the thunderdome!",
+			"Two enter, one leaves! Tune in now!",
+			"Violence like you've never seen it before!",
+			"Spears! Camera! Action! LIVE NOW!"))
+		icon_state = icon_state_on
+	else
+		icon_state = icon_state_off
 
 /obj/machinery/computer/security/telescreen/rd
-	name = "Research Director's telescreen"
+	name = "\improper Research Director's telescreen"
 	desc = "Used for watching the AI and the RD's goons from the safety of his office."
 	network = list("rd", "aicore", "aiupload", "minisat", "xeno", "test")
 
@@ -202,26 +281,26 @@
 	name = "circuitry telescreen"
 	desc = "Used for watching the other eggheads from the safety of the circuitry lab."
 	network = list("rd")
-
+	
 /obj/machinery/computer/security/telescreen/ce
-	name = "Chief Engineer's telescreen"
+	name = "\improper Chief Engineer's telescreen"
 	desc = "Used for watching the engine, telecommunications and the minisat."
 	network = list("engine", "singularity", "tcomms", "minisat")
 
 /obj/machinery/computer/security/telescreen/cmo
-	name = "Chief Medical Officer's telescreen"
+	name = "\improper Chief Medical Officer's telescreen"
 	desc = "A telescreen with access to the medbay's camera network."
 	network = list("medbay")
 
 /obj/machinery/computer/security/telescreen/vault
-	name = "Vault monitor"
+	name = "vault monitor"
 	desc = "A telescreen that connects to the vault's camera network."
 	network = list("vault")
 
 /obj/machinery/computer/security/telescreen/toxins
-	name = "Bomb test site monitor"
+	name = "bomb test site monitor"
 	desc = "A telescreen that connects to the bomb test site's camera."
-	network = list("toxin")
+	network = list("toxins")
 
 /obj/machinery/computer/security/telescreen/engine
 	name = "engine monitor"
@@ -254,7 +333,7 @@
 	network = list("minisat")
 
 /obj/machinery/computer/security/telescreen/aiupload
-	name = "AI upload monitor"
+	name = "\improper AI upload monitor"
 	desc = "A telescreen that connects to the AI upload's camera network."
 	network = list("aiupload")
 

code/game/machinery/computer/camera_advanced.dm

@@ -29,9 +29,17 @@
 		if(lock_override & CAMERA_LOCK_REEBE)
 			z_lock |= SSmapping.levels_by_trait(ZTRAIT_REEBE)
 
+/obj/machinery/computer/camera_advanced/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
+	for(var/i in networks)
+		networks -= i
+		networks += "[idnum][i]"
+
 /obj/machinery/computer/camera_advanced/syndie
 	icon_keyboard = "syndie_key"
 
+/obj/machinery/computer/camera_advanced/syndie/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
+	return //For syndie nuke shuttle, to spy for station.
+
 /obj/machinery/computer/camera_advanced/proc/CreateEye()
 	eyeobj = new()
 	eyeobj.origin = src

code/game/machinery/computer/communications.dm

@@ -61,7 +61,7 @@
 		// main interface
 		if("main")
 			state = STATE_DEFAULT
-			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 		if("login")
 			var/mob/M = usr
 
@@ -73,19 +73,19 @@
 					auth_id = "[I.registered_name] ([I.assignment])"
 					if((ACCESS_CAPTAIN in I.access))
 						authenticated = 2
-					playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
+					playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
 				if(obj_flags & EMAGGED)
 					authenticated = 2
 					auth_id = "Unknown"
 					to_chat(M, "<span class='warning'>[src] lets out a quiet alarm as its login is overridden.</span>")
-					playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
-					playsound(src, 'sound/machines/terminal_alert.ogg', 25, 0)
+					playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
+					playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE)
 					if(prob(25))
 						for(var/mob/living/silicon/ai/AI in active_ais())
 							SEND_SOUND(AI, sound('sound/machines/terminal_alert.ogg', volume = 10)) //Very quiet for balance reasons
 		if("logout")
 			authenticated = 0
-			playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
 
 		if("swipeidseclevel")
 			var/mob/M = usr
@@ -109,7 +109,7 @@
 					security_level_cd = world.time + 15 SECONDS
 					if(GLOB.security_level != old_level)
 						to_chat(usr, "<span class='notice'>Authorization confirmed. Modifying security level.</span>")
-						playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+						playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 						//Only notify people if an actual change happened
 						var/security_level = NUM2SECLEVEL(GLOB.security_level)
 						log_game("[key_name(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].")
@@ -118,28 +118,28 @@
 					tmp_alertlevel = 0
 				else
 					to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>")
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 					tmp_alertlevel = 0
 				state = STATE_DEFAULT
 			else
 				to_chat(usr, "<span class='warning'>You need to swipe your ID!</span>")
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 
 		if("announce")
 			if(authenticated==2)
-				playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 				make_announcement(usr)
 
 		if("crossserver")
 			if(authenticated==2)
 				if(!checkCCcooldown())
-					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 					return
 				var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations.  Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "")
 				if(!input || !(usr in view(1,src)) || !checkCCcooldown())
 					return
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 				send2otherserver("[station_name()]", input,"Comms_Console")
 				minor_announce(input, title = "Outgoing message to allied station")
 				usr.log_talk(input, LOG_SAY, tag="message to the other server")
@@ -168,22 +168,18 @@
 						if(D)
 							points_to_check = D.account_balance
 						if(points_to_check >= S.credit_cost)
-							var/obj/machinery/shuttle_manipulator/M = locate() in GLOB.machines
-							if(M)
-								SSshuttle.shuttle_purchased = TRUE
-								D.adjust_money(-S.credit_cost)
-								minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
-								message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
-								SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
-								M.unload_preview()
-								M.load_template(S)
-								M.existing_shuttle = SSshuttle.emergency
-								M.action_load(S)
-								message_admins("[S.name] loaded, purchased by [usr]")
-							else
-								to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
+							SSshuttle.shuttle_purchased = TRUE
+							SSshuttle.unload_preview()
+							SSshuttle.load_template(S)
+							SSshuttle.existing_shuttle = SSshuttle.emergency
+							SSshuttle.action_load(S)
+							D.adjust_money(-S.credit_cost)
+							minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
+							message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
+							log_shuttle("[key_name(usr)] has purchased [S.name].")
+							SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
 						else
-							to_chat(usr, "Not enough credits.")
+							to_chat(usr, "<span class='alert'>Insufficient credits.</span>")
 
 		if("callshuttle")
 			state = STATE_DEFAULT
@@ -268,7 +264,7 @@
 
 		// Status display stuff
 		if("setstat")
-			playsound(src, "terminal_type", 50, 0)
+			playsound(src, "terminal_type", 50, FALSE)
 			switch(href_list["statdisp"])
 				if("message")
 					post_status("message", stat_msg1, stat_msg2)
@@ -308,13 +304,13 @@
 		if("MessageSyndicate")
 			if((authenticated==2) && (obj_flags & EMAGGED))
 				if(!checkCCcooldown())
-					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 					return
 				var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "")
 				if(!input || !(usr in view(1,src)) || !checkCCcooldown())
 					return
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 				Syndicate_announce(input, usr)
 				to_chat(usr, "<span class='danger'>SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.</span>")
 				for(var/client/X in GLOB.admins)
@@ -327,7 +323,7 @@
 
 		if("RestoreBackup")
 			to_chat(usr, "<span class='notice'>Backup routing data restored!</span>")
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 			obj_flags &= ~EMAGGED
 			updateDialog()
 
@@ -341,7 +337,7 @@
 					return
 				Nuke_request(input, usr)
 				to_chat(usr, "<span class='notice'>Request sent.</span>")
-				usr.log_message("has requested the nuclear codes from CentCom", LOG_SAY)
+				usr.log_message("has requested the nuclear codes from CentCom with reason \"[input]\"", LOG_SAY)
 				priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested","commandreport")
 				CM.lastTimeUsed = world.time
 
@@ -448,7 +444,7 @@
 	if(authenticated == 1)
 		authenticated = 2
 	to_chat(user, "<span class='danger'>You scramble the communication routing circuits!</span>")
-	playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
+	playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
 	return TRUE
 
 /obj/machinery/computer/communications/ui_interact(mob/user)
@@ -514,16 +510,16 @@
 				dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=login'>Log In</A> \]"
 		if(STATE_CALLSHUTTLE)
 			dat += get_call_shuttle_form()
-			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 		if(STATE_CANCELSHUTTLE)
 			dat += get_cancel_shuttle_form()
-			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 		if(STATE_MESSAGELIST)
 			dat += "Messages:"
 			for(var/i in 1 to messages.len)
 				var/datum/comm_message/M = messages[i]
 				dat += "<BR><A HREF='?src=[REF(src)];operation=viewmessage;message-num=[i]'>[M.title]</A>"
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 		if(STATE_VIEWMESSAGE)
 			if (currmsg)
 				dat += "<B>[currmsg.title]</B><BR><BR>[currmsg.content]"
@@ -557,7 +553,7 @@
 			dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=redalert'>Red Alert</A> |"
 			dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=lockdown'>Lockdown</A> |"
 			dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=biohazard'>Biohazard</A> \]<BR><HR>"
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 		if(STATE_ALERT_LEVEL)
 			dat += "Current alert level: [NUM2SECLEVEL(GLOB.security_level)]<BR>"
 			if(GLOB.security_level == SEC_LEVEL_DELTA)
@@ -571,7 +567,7 @@
 			dat += "Confirm the change to: [NUM2SECLEVEL(tmp_alertlevel)]<BR>"
 			dat += "<A HREF='?src=[REF(src)];operation=swipeidseclevel'>Swipe ID</A> to confirm change.<BR>"
 		if(STATE_TOGGLE_EMERGENCY)
-			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 			if(GLOB.emergency_access == 1)
 				dat += "<b>Emergency Maintenance Access is currently <font color='red'>ENABLED</font></b>"
 				dat += "<BR>Restore maintenance access restrictions? <BR>\[ <A HREF='?src=[REF(src)];operation=disableemergency'>OK</A> | <A HREF='?src=[REF(src)];operation=viewmessage'>Cancel</A> \]"
@@ -722,7 +718,7 @@
 
 /obj/machinery/computer/communications/proc/make_announcement(mob/living/user, is_silicon)
 	if(!SScommunications.can_announce(user, is_silicon))
-		to_chat(user, "Intercomms recharging. Please stand by.")
+		to_chat(user, "<span class='alert'>Intercomms recharging. Please stand by.</span>")
 		return
 	var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?")
 	if(!input || !user.canUseTopic(src))

code/game/machinery/computer/crew.dm

@@ -80,7 +80,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 							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, "crew", "crew monitor", 800, 600 , master_ui, state)
+		ui = new(user, src, ui_key, "CrewConsole", "crew monitor", 800, 600 , master_ui, state)
 		ui.open()
 
 /datum/crewmonitor/proc/show(mob/M, source)

code/game/machinery/computer/launchpad_control.dm

@@ -56,7 +56,7 @@
 /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)
 	if(!ui)
-		ui = new(user, src, ui_key, "launchpad_console", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "LaunchpadConsole", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/launchpad/ui_data(mob/user)

code/game/machinery/computer/prisoner/gulag_teleporter.dm

@@ -25,7 +25,7 @@
 									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, "gulag_console", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "GulagTeleporterConsole", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_data(mob/user)

code/game/machinery/computer/robot.dm

@@ -5,163 +5,123 @@
 	icon_keyboard = "rd_key"
 	req_access = list(ACCESS_ROBOTICS)
 	circuit = /obj/item/circuitboard/computer/robotics
-	var/temp = null
-
 	light_color = LIGHT_COLOR_PINK
+	ui_x = 500
+	ui_y = 460
 
 /obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R)
+	. = FALSE
 	if(!istype(R))
-		return FALSE
+		return
 	if(isAI(user))
-		if (R.connected_ai != user)
-			return FALSE
+		if(R.connected_ai != user)
+			return
 	if(iscyborg(user))
-		if (R != user)
-			return FALSE
+		if(R != user)
+			return
 	if(R.scrambledcodes)
-		return FALSE
-	if (hasSiliconAccessInArea(user) && !issilicon(user))
-		if (!Adjacent(user))
-			return FALSE
+		return
 	return TRUE
 
-/obj/machinery/computer/robotics/ui_interact(mob/user)
-	. = ..()
-	if (src.z > 6)
-		to_chat(user, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
-		return
-	user.set_machine(src)
-	var/dat
-	var/robots = 0
+/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)
+	if(!ui)
+		ui = new(user, src, ui_key, "RoboticsControlConsole", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/robotics/ui_data(mob/user)
+	var/list/data = list()
+
+	data["can_hack"] = FALSE
+	if(issilicon(user))
+		var/mob/living/silicon/S = user
+		if(S.hack_software)
+			data["can_hack"] = TRUE
+	else if(IsAdminGhost(user))
+		data["can_hack"] = TRUE
+
+	data["cyborgs"] = list()
 	for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs)
 		if(!can_control(user, R))
 			continue
-		robots++
-		dat += "[R.name] |"
-		if(R.stat)
-			dat += " Not Responding |"
-		else if(R.locked_down)
-			dat += " Locked Down |"
-		else
-			dat += " Operating Normally |"
-		if(R.cell)
-			dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |"
-		else
-			dat += " No Cell Installed |"
-		if(R.module)
-			dat += " Module Installed ([R.module.name]) |"
-		else
-			dat += " No Module Installed |"
-		if(R.connected_ai)
-			dat += " Slaved to [R.connected_ai.name] |"
-		else
-			dat += " Independent from AI |"
-		if(issilicon(user) && user != R)
-			var/mob/living/silicon/S = user
-			if(is_servant_of_ratvar(S))
-				dat += "<A href='?src=[REF(src)];convert=[REF(R)]'>(<font color=#BE8700><i>Convert</i></font>)</A> "
-			else if(S.hack_software && !R.emagged)
-				dat += "<A href='?src=[REF(src)];magbot=[REF(R)]'>(<font color=blue><i>Hack</i></font>)</A> "
-		else if(IsAdminGhost(user) && !R.emagged)
-			dat += "<A href='?src=[REF(src)];magbot=[REF(R)]'>(<font color=blue><i>Hack</i></font>)</A> "
-		dat += "<A href='?src=[REF(src)];stopbot=[REF(R)]'>(<font color=green><i>[R.locked_down? "Lockdown" : "Release"]</i></font>)</A> "
-		dat += "<A href='?src=[REF(src)];killbot=[REF(R)]'>(<font color=red><i>Destroy</i></font>)</A>"
-		dat += "<BR>"
+		if(z != (get_turf(R)).z)
+			continue
+		var/list/cyborg_data = list(
+			name = R.name,
+			locked_down = R.locked_down,
+			status = R.stat,
+			charge = R.cell ? round(R.cell.percent()) : null,
+			module = R.module ? "[R.module.name] Module" : "No Module Detected",
+			synchronization = R.connected_ai,
+			emagged =  R.emagged,
+			ref = REF(R)
+		)
+		data["cyborgs"] += list(cyborg_data)
 
-	if(!robots)
-		dat += "No Cyborg Units detected within access parameters."
-		dat += "<BR>"
-
-	var/drones = 0
+	data["drones"] = list()
 	for(var/mob/living/simple_animal/drone/D in GLOB.drones_list)
 		if(D.hacked)
 			continue
-		drones++
-		dat += "[D.name] |"
-		if(D.stat)
-			dat += " Not Responding |"
-		dat += "<A href='?src=[REF(src)];killdrone=[REF(D)]'>(<font color=red><i>Destroy</i></font>)</A>"
-		dat += "<BR>"
+		if(z != (get_turf(D)).z)
+			continue
+		var/list/drone_data = list(
+			name = D.name,
+			status = D.stat,
+			ref = REF(D)
+		)
+		data["drones"] += list(drone_data)
 
-	if(!drones)
-		dat += "No Drone Units detected within access parameters."
+	return data
 
-	var/datum/browser/popup = new(user, "computer", "Cyborg Control Console", 400, 500)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-	return
-
-/obj/machinery/computer/robotics/Topic(href, href_list)
+/obj/machinery/computer/robotics/ui_act(action, params)
 	if(..())
 		return
 
-	if (href_list["temp"])
-		src.temp = null
-
-	else if (href_list["killbot"])
-		if(src.allowed(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["killbot"]) in GLOB.silicon_mobs
-			if(can_control(usr, R))
-				var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort")
-				if(choice == "Confirm" && can_control(usr, R) && !..())
+	switch(action)
+		if("killbot")
+			if(allowed(usr))
+				var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs
+				if(can_control(usr, R) && !..())
 					var/turf/T = get_turf(R)
 					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!</span>")
 					log_game("\<span class='notice'>[key_name(usr)] detonated [key_name(R)]!</span>")
 					if(R.connected_ai)
 						to_chat(R.connected_ai, "<br><br><span class='alert'>ALERT - Cyborg detonation detected: [R.name]</span><br>")
 					R.self_destruct()
-		else
-			to_chat(usr, "<span class='danger'>Access Denied.</span>")
-
-	else if (href_list["stopbot"])
-		if(src.allowed(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs
-			if(can_control(usr, R))
-				var/choice = input("Are you certain you wish to [!R.locked_down ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
-				if(choice == "Confirm" && can_control(usr, R) && !..())
-					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] [!R.locked_down ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!</span>")
+			else
+				to_chat(usr, "<span class='danger'>Access Denied.</span>")
+		if("stopbot")
+			if(allowed(usr))
+				var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs
+				if(can_control(usr, R) && !..())
+					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] [!R.locked_down ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!</span>")
 					log_game("[key_name(usr)] [!R.locked_down ? "locked down" : "released"] [key_name(R)]!")
 					R.SetLockdown(!R.locked_down)
 					to_chat(R, "[!R.locked_down ? "<span class='notice'>Your lockdown has been lifted!" : "<span class='alert'>You have been locked down!"]</span>")
 					if(R.connected_ai)
 						to_chat(R.connected_ai, "[!R.locked_down ? "<span class='notice'>NOTICE - Cyborg lockdown lifted" : "<span class='alert'>ALERT - Cyborg lockdown detected"]: <a href='?src=[REF(R.connected_ai)];track=[html_encode(R.name)]'>[R.name]</a></span><br>")
-
-		else
-			to_chat(usr, "<span class='danger'>Access Denied.</span>")
-
-	else if (href_list["magbot"])
-		var/mob/living/silicon/S = usr
-		if((istype(S) && S.hack_software) || IsAdminGhost(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs
-			if(istype(R) && !R.emagged && (R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R))
-				log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!")
-				message_admins("[ADMIN_LOOKUPFLW(usr)] emagged cyborg [key_name_admin(R)] using robotic console!")
-				R.SetEmagged(1)
-
-	else if(href_list["convert"])
-		if(isAI(usr) && is_servant_of_ratvar(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs
-			if(istype(R) && !is_servant_of_ratvar(R) && R.connected_ai == usr)
-				log_game("[key_name(usr)] converted [key_name(R)] using robotic console!")
-				message_admins("[ADMIN_LOOKUPFLW(usr)] converted cyborg [key_name_admin(R)] using robotic console!")
-				add_servant_of_ratvar(R)
-
-	else if (href_list["killdrone"])
-		if(src.allowed(usr))
-			var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"]) in GLOB.mob_list
-			if(D.hacked)
-				to_chat(usr, "<span class='danger'>ERROR: [D] is not responding to external commands.</span>")
 			else
-				var/turf/T = get_turf(D)
-				message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(D)] at [ADMIN_VERBOSEJMP(T)]!")
-				log_game("[key_name(usr)] detonated [key_name(D)]!")
-				var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-				s.set_up(3, 1, D)
-				s.start()
-				D.visible_message("<span class='danger'>\the [D] self destructs!</span>")
-				D.gib()
-
-
-	src.updateUsrDialog()
-	return
+				to_chat(usr, "<span class='danger'>Access Denied.</span>")
+		if("magbot")
+			var/mob/living/silicon/S = usr
+			if((istype(S) && S.hack_software) || IsAdminGhost(usr))
+				var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs
+				if(istype(R) && !R.emagged && (R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R))
+					log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!")
+					message_admins("[ADMIN_LOOKUPFLW(usr)] emagged cyborg [key_name_admin(R)] using robotic console!")
+					R.SetEmagged(TRUE)
+		if("killdrone")
+			if(allowed(usr))
+				var/mob/living/simple_animal/drone/D = locate(params["ref"]) in GLOB.mob_list
+				if(D.hacked)
+					to_chat(usr, "<span class='danger'>ERROR: [D] is not responding to external commands.</span>")
+				else
+					var/turf/T = get_turf(D)
+					message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(D)] at [ADMIN_VERBOSEJMP(T)]!")
+					log_game("[key_name(usr)] detonated [key_name(D)]!")
+					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.gib()

code/game/machinery/computer/station_alert.dm

@@ -20,7 +20,7 @@
 									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, "station_alert", name, 325, 500, master_ui, state)
+		ui = new(user, src, ui_key, "StationAlertConsole", name, 325, 500, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/station_alert/ui_data(mob/user)

code/game/machinery/computer/teleporter.dm

@@ -38,7 +38,7 @@ obj/machinery/computer/teleporter/ui_interact(mob/user, ui_key = "main", datum/t
 									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, "teleporter", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "Teleporter", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/teleporter/ui_data(mob/user)