Code/Machinery/Computer/airtunnel.dm

@@ -112,7 +112,7 @@ obj/machinery/computer/airtunnel
 		dat += "<A href='?src=\ref[src];release=1'>RELEASE (Siphons only)</A> <A href='?src=\ref[src];siphon=1'>Siphon (Siphons only)</A> <A href='?src=\ref[src];stop_siph=1'>Stop</A> <A href='?src=\ref[src];auto=1'>Regulate</A><BR>"
 		dat += "<BR><BR><A href='?src=\ref[user];mach_close=computer'>Close</A></TT></BODY></HTML>"
 
-		user << browse(dat, "window=computer;size=400x500")
+		user.client_mob() << browse(dat, "window=computer;size=400x500")
 
 
 	// Handle topic links from interaction window
@@ -123,8 +123,9 @@ obj/machinery/computer/airtunnel
 
 		if ((!( istype(usr, /mob/human) ) && (!( ticker ) || (ticker && ticker.mode != "monkey"))))
 			if (!istype(usr, /mob/ai))
-				usr << "\red You don't have the dexterity to do this!"
-				return
+				if (!istype(usr, /mob/drone))
+					usr.client_mob() << "\red You don't have the dexterity to do this!"
+					return
 		if ((usr.stat || usr.restrained()))
 			if (!istype(usr, /mob/ai))
 				return

Code/Machinery/Computer/atmosphere.dm

@@ -59,7 +59,7 @@ obj/machinery/computer/atmosphere
 			if(stat & NOPOWER)	return
 			if (usr.stat)
 				return
-			usr << "Starting all siphon systems."
+			usr.client_mob() << "Starting all siphon systems."
 			for(var/obj/machinery/atmoalter/siphs/S in src.returnarea())
 				S.reset(1, 0)
 			src.add_fingerprint(usr)
@@ -72,7 +72,7 @@ obj/machinery/computer/atmosphere
 			if(stat & NOPOWER)	return
 			if (usr.stat)
 				return
-			usr << "Stopping all siphon systems."
+			usr.client_mob() << "Stopping all siphon systems."
 			for(var/obj/machinery/atmoalter/siphs/S in src.returnarea())
 				S.reset(0, 0)
 			src.add_fingerprint(usr)
@@ -85,7 +85,7 @@ obj/machinery/computer/atmosphere
 			if(stat & NOPOWER)	return
 			if (usr.stat)
 				return
-			usr << "Starting automatic air control systems."
+			usr.client_mob() << "Starting automatic air control systems."
 			for(var/obj/machinery/atmoalter/siphs/S in src.returnarea())
 				S.reset(0, 1)
 			src.add_fingerprint(usr)
@@ -99,7 +99,7 @@ obj/machinery/computer/atmosphere
 			if(stat & NOPOWER)	return
 			if (usr.stat)
 				return
-			usr << "Releasing all scrubber toxins."
+			usr.client_mob() << "Releasing all scrubber toxins."
 			for(var/obj/machinery/atmoalter/siphs/scrubbers/S in src.returnarea())
 				S.reset(-1.0, 0)
 			src.add_fingerprint(usr)
@@ -112,7 +112,7 @@ obj/machinery/computer/atmosphere
 			if(stat & NOPOWER)	return
 			if (usr.stat)
 				return
-			usr << "Releasing all stored air."
+			usr.client_mob() << "Releasing all stored air."
 			for(var/obj/machinery/atmoalter/siphs/S in src.returnarea())
 				S.reset(-1.0, 0)
 			src.add_fingerprint(usr)

Code/Machinery/Computer/card.dm

@@ -146,7 +146,7 @@ obj/machinery/computer/card
 				dat = text("<TT><B>Identification Card Modifier</B><BR>\n<I>Please Insert the cards into the slots</I><BR>\nTarget: <A href='?src=\ref[];modify=1'>[]</A><BR>\nConfirm Identity: <A href='?src=\ref[];scan=1'>[]</A><BR>\n-----------------<BR>\n[]<BR>\n<BR>\n<BR>\n<A href='?src=\ref[];mode=1'>Access Crew Manifest</A><BR>\n</TT>", src, (src.modify ? text("[]", src.modify.name) : "----------"), src, (src.scan ? text("[]", src.scan.name) : "----------"), d1, src)
 			else
 				dat = text("<TT><B>[]</B><BR>\n<I>[]</I><BR>\n[] <A href='?src=\ref[];modify=1'>[]</A><BR>\n[] <A href='?src=\ref[];scan=1'>[]</A><BR>\n-----------------<BR>\n[]<BR>\n<BR>\n<BR>\n<A href='?src=\ref[];mode=1'>[]</A><BR>\n</TT>", stars("Identification Card Modifier"), stars("Please Insert the cards into the slots"), stars("Target:"), src, (src.modify ? text("[]", stars(src.modify.name)) : "----------"), stars("Confirm Identity:"), src, (src.scan ? text("[]", stars(src.scan.name)) : "----------"), d1, src, stars("Access Crew Manifest"))
-		user << browse(dat, "window=id_com;size=400x500")
+		user.client_mob() << browse(dat, "window=id_com;size=400x500")
 
 
 	// Handle topic links from interaction window
@@ -155,7 +155,7 @@ obj/machinery/computer/card
 		..()
 
 		if(stat & (NOPOWER|BROKEN))
-			usr << browse(null, "window=id_com")
+			usr.client_mob() << browse(null, "window=id_com")
 			return
 
 		if(usr.restrained() || usr.lying)
@@ -164,7 +164,7 @@ obj/machinery/computer/card
 
 		if ((!( istype(usr, /mob/human) ) && (!( ticker ) || (ticker && ticker.mode != "monkey"))))
 			if (!istype(usr, /mob/ai))		
-				usr << "\red You don't have the dexterity to do this!"
+				usr.client_mob() << "\red You don't have the dexterity to do this!"
 				return
 		if ((usr.stat || usr.restrained()))
 			if (!istype(usr, /mob/ai))
@@ -206,7 +206,7 @@ obj/machinery/computer/card
 							src.authenticated = 1
 				else if (!href_list["print"])
 					if ((!( src.authenticated ) && (istype(usr, /mob/ai))) && (!src.modify))
-						usr << "You can't modify an ID without an ID inserted to modify. Once one is in the modify slot on the computer, you can log in."
+						usr.client_mob() << "You can't modify an ID without an ID inserted to modify. Once one is in the modify slot on the computer, you can log in."
 			
 			if (href_list["vo"])
 				if (src.authenticated)
@@ -274,13 +274,11 @@ obj/machinery/computer/card
 			if (src.modify)
 				src.modify.name = "[src.modify.registered]'s ID Card ([src.modify.access_level]>[src.modify.lab_access]-[src.modify.engine_access]-[src.modify.air_access])"
 
-			for(var/mob/M in viewers(1, src))
-				if ((M.client && M.machine == src))
-					src.attack_hand(M)
+			src.updateDialog()
 
 			src.add_fingerprint(usr)
 		else
-			usr << browse(null, "window=id_com")
+			usr.client_mob() << browse(null, "window=id_com")
 
 
 	// Called when area power state changes

Code/Machinery/Computer/data.dm

@@ -21,9 +21,9 @@ obj/machinery/computer/data
 		set src in oview(1)
 
 		for(var/x in src.topics)
-			usr << "[x], \..."
+			usr.client_mob() << "[x], \..."
 
-		usr << ""
+		usr.client_mob() << ""
 		src.add_fingerprint(usr)
 		return
 
@@ -34,9 +34,9 @@ obj/machinery/computer/data
 		set src in oview(1)
 
 		if (src.topics[text("[]", topic)])
-			usr << "<B>[topic]</B>\n\t [src.topics["[topic]"]]"
+			usr.client_mob() << "<B>[topic]</B>\n\t [src.topics["[topic]"]]"
 		else
-			usr << "Unable to find- [topic]"
+			usr.client_mob() << "Unable to find- [topic]"
 		src.add_fingerprint(usr)
 		return
 
@@ -81,7 +81,7 @@ obj/machinery/computer/data
 			display()
 				set src in oview(1)
 
-				usr << "<B>Research Information:</B>"
+				usr.client_mob() << "<B>Research Information:</B>"
 				..()
 				return
 
@@ -108,7 +108,7 @@ obj/machinery/computer/data
 			display()
 				set src in oview(1)
 
-				usr << "<B>Research Log:</B>"
+				usr.client_mob() << "<B>Research Log:</B>"
 				..()
 				return
 

Code/Machinery/Computer/drone_control.dm

@@ -0,0 +1,58 @@
+/obj/machinery/computer/drone_control
+	name = "Drone Control Station"
+	icon = 'stationobjs.dmi'
+	icon_state = "drone_control"
+	var/mob/user = null
+	
+	New()
+		spawn(10)
+			while (!config)
+				sleep(10)
+			if ((!config.humans_can_use_drones) || (!config.enable_drones))
+				del(src)
+		
+	attack_hand(var/mob/user as mob)
+		if(stat & (NOPOWER|BROKEN) ) return
+		if (!config.humans_can_use_drones)
+			return
+		if (user.currentDrone)
+			return
+		if (istype(user, /mob/drone))
+			return
+		
+		var/list/L = list(  )
+		user.machine = src
+		
+		var/numDrones = 0
+		for(var/mob/drone/rob in world)
+			if (rob.stat==0)
+				L[rob.name] = rob
+				numDrones+=1
+		L = sortList(L)
+		
+		L["Cancel"] = "Cancel"
+		var/t = input(user, "Which drone would you like to change to?") as null|anything in L
+
+		if(!t)
+			user.machine = null
+			user.reset_view(null)
+			return 0
+		if (t == "Cancel")
+			user.machine = null
+			user.reset_view(null)
+			return 0
+		
+		var/selected = L[t]
+		if (istype(selected, /mob/drone))
+			user.machine = null
+			user.reset_view(null)
+			selected:use_via_drone_control(user)
+		return
+
+	attack_ai(var/mob/user as mob)
+		user << "To control a drone, click it. The drone control stations are for humans."
+		return
+	
+	attack_paw(var/mob/user as mob)
+		user << "Monkeys can't control drones."
+		return

Code/Machinery/Computer/engine.dm

@@ -40,9 +40,7 @@
 			return
 		use_power(250)
 
-		for(var/mob/M in viewers(1, src))
-			if ((M.client && M.machine == src))
-				src.attack_hand(M)
+		src.updateDialog()
 
 
 	// Attackby object - pass through to interact
@@ -85,7 +83,7 @@
 				dat = "<B>Engine Ejection Module</B><HR>\nStatus: Ejecting<BR>\n<BR>\nCountdown: [engine_eject_control.timeleft]/60 \[Reset\]<BR>\n<BR>\n<A href='?src=\ref[src];stop=1'>Stop Ejection</A><BR>\n<BR>\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"
 			else
 				dat = "<B>Engine Ejection Module</B><HR>\nStatus: Ejected<BR>\n<BR>\nCountdown: N/60 \[Reset\]<BR>\n<BR>\nEngine Ejected!<BR>\n<BR>\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"
-		user << browse(dat, "window=computer;size=400x500")
+		user.client_mob() << browse(dat, "window=computer;size=400x500")
 
 
 	// Handle topic links from interaction window
@@ -94,8 +92,9 @@
 		..()
 		if ((!( istype(usr, /mob/human) ) && (!( ticker ) || (ticker && ticker.mode != "monkey"))))
 			if (!istype(usr, /mob/ai))
-				usr << "\red You don't have the dexterity to do this!"
-				return
+				if (!istype(usr, /mob/drone))
+					usr.client_mob() << "\red You don't have the dexterity to do this!"
+					return
 		if ((usr.stat || usr.restrained()))
 			if (!istype(usr, /mob/ai))
 				return
@@ -114,7 +113,7 @@
 							engine_eject_control.ejectstart()
 							src.temp = null
 					else
-						usr << "\red Access Denied."
+						usr.client_mob() << "\red Access Denied."
 			else if (href_list["stop"])
 				if (engine_eject_control.status > 0)
 					src.temp = text("Stop Ejection?<BR><BR><A href='?src=\ref[];stop2=1'>Yes</A><BR><A href='?src=\ref[];temp=1'>No</A>", src, src)

Code/Machinery/Computer/hologram.dm

@@ -85,7 +85,7 @@ Hair Color: ([h_r],[h_g],[h_b]) <A href='?src=\ref[src];h_reset=1'>\[Reset\]</A>
 Red (0-255): <A href='?src=\ref[src];h_r=-300'>\[0\]</A> <A href='?src=\ref[src];h_r=-10'>-10</A> <A href='?src=\ref[src];h_r=-1'>-1</A> [h_r] <A href='?src=\ref[src];h_r=1'>1</A> <A href='?src=\ref[src];h_r=10'>10</A> <A href='?src=\ref[src];h_r=300'>\[255\]</A><BR>
 Green (0-255): <A href='?src=\ref[src];h_g=-300'>\[0\]</A> <A href='?src=\ref[src];h_g=-10'>-10</A> <A href='?src=\ref[src];h_g=-1'>-1</A> [h_g] <A href='?src=\ref[src];h_g=1'>1</A> <A href='?src=\ref[src];h_g=10'>10</A> <A href='?src=\ref[src];h_g=300'>\[255\]</A><BR>
 Blue (0-255): <A href='?src=\ref[src];h_b=-300'>\[0\]</A> <A href='?src=\ref[src];h_b=-10'>-10</A> <A href='?src=\ref[src];h_b=-1'>-1</A> [h_b] <A href='?src=\ref[src];h_b=1'>1</A> <A href='?src=\ref[src];h_b=10'>10</A> <A href='?src=\ref[src];h_b=300'>\[255\]</A><BR>"}
-		user << browse(dat, "window=hologram_console")
+		user.client_mob() << browse(dat, "window=hologram_console")
 
 
 	// Handle topic links from window
@@ -131,9 +131,7 @@ Blue (0-255): <A href='?src=\ref[src];h_b=-300'>\[0\]</A> <A href='?src=\ref[src
 			else if (href_list["temp"])
 				src.temp = null
 
-			for(var/mob/M in viewers(1, src))
-				if ((M.client && M.machine == src))
-					src.show_console(M)
+			src.updateDialog()
 
 
 /*

Code/Machinery/Computer/med_data.dm

@@ -114,7 +114,7 @@ Important Notes:<BR>
 
 			else
 				dat += "<A href='?src=\ref[src];login=1'>{Log In}</A>"
-		user << browse("<HEAD><TITLE>Medical Records</TITLE></HEAD><TT>[dat]</TT>", "window=med_rec")
+		user.client_mob() << browse("<HEAD><TITLE>Medical Records</TITLE></HEAD><TT>[dat]</TT>", "window=med_rec")
 
 
 

Code/Machinery/Computer/pod.dm

@@ -43,7 +43,9 @@ obj/machinery/computer/pod
 		if(stat & (NOPOWER|BROKEN)) return
 
 		if (!( src.connected ))
-			viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!"
+			var/list/observers = viewers(null, null)
+			for (var/mob/who in observers)
+				who.client_mob() << "Cannot locate mass driver connector. Cancelling firing sequence!"
 			return
 
 		for(var/obj/machinery/door/poddoor/M in machines)
@@ -116,7 +118,7 @@ Time Left: [(minute ? "[minute]:" : null)][second] <A href='?src=\ref[src];tp=-3
 			dat += "<BR>\n<A href = '?src=\ref[src];door=1'>Toggle Outer Door</A><BR>"
 
 		dat += "<BR><BR><A href='?src=\ref[user];mach_close=computer'>Close</A></TT></BODY></HTML>"
-		user << browse(dat, "window=computer;size=400x500")
+		user.client_mob() << browse(dat, "window=computer;size=400x500")
 
 
 	// Handle topic links from interaction window
@@ -125,7 +127,7 @@ Time Left: [(minute ? "[minute]:" : null)][second] <A href='?src=\ref[src];tp=-3
 		..()
 
 		if(stat & (NOPOWER|BROKEN))
-			usr << browse(null, "window=computer")
+			usr.client_mob() << browse(null, "window=computer")
 			return
 
 		if (usr.restrained() || usr.lying)
@@ -133,9 +135,10 @@ Time Left: [(minute ? "[minute]:" : null)][second] <A href='?src=\ref[src];tp=-3
 				return
 
 		if ((!( istype(usr, /mob/human) ) && (!( ticker ) || (ticker && ticker.mode != "monkey"))))
-			if (!istype(usr, /mob/ai))		
-				usr << "\red You don't have the dexterity to do this!"
-				return
+			if (!istype(usr, /mob/ai))
+				if (!istype(usr, /mob/drone))
+					usr.client_mob() << "\red You don't have the dexterity to do this!"
+					return
 		if ((usr.stat || usr.restrained()))
 			if (!istype(usr, /mob/ai))
 				return

Code/Machinery/Computer/prision_shuttle.dm

@@ -61,7 +61,7 @@ obj/machinery/computer/prison_shuttle
 						del(T)
 				prison_entered = 1
 			else
-				usr << "\blue There is an obstructing shuttle!"
+				usr.client_mob() << "\blue There is an obstructing shuttle!"
 
 
 	// Restabalize verb
@@ -70,7 +70,9 @@ obj/machinery/computer/prison_shuttle
 	verb/restabalize()
 		set src in oview(1)
 
-		viewers(null, null) << "\red <B>Restabalizing prison shuttle atmosphere!</B>"
+		var/list/observers = viewers(null, null)
+		for (var/mob/who in observers)
+			who.client_mob() << "\red <B>Restabilizing prison shuttle atmosphere!</B>"
 		var/A = locate(/area/shuttle_prison)
 		for(var/obj/move/T in A)
 			T.firelevel = 0
@@ -93,5 +95,7 @@ obj/machinery/computer/prison_shuttle
 			T.otemp = T20C
 			T.ttemp = T20C
 
-		viewers(null, null) << "\red <B>Prison shuttle Restabalized!</B>"
+		observers = viewers(null, null)
+		for (var/mob/who in observers)
+			who.client_mob() << "\red <B>Prison shuttle Restabilized!</B>"
 		src.add_fingerprint(usr)

Code/Machinery/Computer/secure_data.dm

@@ -79,7 +79,7 @@ obj/machinery/computer/secure_data
 					else
 			else
 				dat += text("<A href='?src=\ref[];login=1'>{Log In}</A>", src)
-		user << browse(text("<HEAD><TITLE>Security Records</TITLE></HEAD><TT>[]</TT>", dat), "window=secure_rec")
+		user.client_mob() << browse(text("<HEAD><TITLE>Security Records</TITLE></HEAD><TT>[]</TT>", dat), "window=secure_rec")
 
 
 	// Handle topic links

Code/Machinery/Computer/shuttle.dm

@@ -22,7 +22,7 @@ obj/machinery/computer/shuttle
 	verb/restabalize()
 		set src in oview(1)
 
-		world << "\red <B>Restabalizing shuttle atmosphere!</B>"
+		world << "\red <B>Restabilizing shuttle atmosphere!</B>"
 		var/A = locate(/area/shuttle)
 		for(var/obj/move/T in A)
 			T.firelevel = 0
@@ -45,7 +45,7 @@ obj/machinery/computer/shuttle
 			T.otemp = T20C
 			T.ttemp = T20C
 
-		world << "\red <B>Shuttle Restabalized!</B>"
+		world << "\red <B>Shuttle Restabilized!</B>"
 		src.add_fingerprint(usr)
 
 
@@ -75,7 +75,7 @@ obj/machinery/computer/shuttle
 		if ((!( istype(W, /obj/item/weapon/card/id) ) || !( ticker ) || ticker.shuttle_location == shuttle_z || !( user )))
 			return
 		if (!W.check_access(access, allowed))
-			user << text("The access level ([]) of [] card is not high enough. ", W.access_level, W.registered)
+			user.client_mob() << text("The access level ([]) of [] card is not high enough. ", W.access_level, W.registered)
 			return
 		var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort")
 		switch(choice)