Merge pull request #5806 from Markolie/cameraconsoleupdate

Camera console update

code/modules/paperwork/photography.dm

@@ -537,13 +537,13 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 		if(get_dist(src, M) <= canhear_range)
 			talk_into(M, msg)
 		for(var/obj/machinery/computer/security/telescreen/T in machines)
-			if(T.current == camera)
+			if(T.watchers[M] == camera)
 				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> says, '[msg]'", hearing_distance = 2)
 
 /obj/item/device/videocam/hear_message(mob/M as mob, msg)
 	if(camera && on)
 		for(var/obj/machinery/computer/security/telescreen/T in machines)
-			if(T.current == camera)
+			if(T.watchers[M] == camera)
 				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> [msg]", hearing_distance = 2)
 
 

code/modules/power/apc.dm

@@ -896,7 +896,7 @@
 	return 1
 
 /obj/machinery/power/apc/proc/is_authenticated(mob/user as mob)
-	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
+	if(user.can_admin_interact())
 		return 1
 	if(isAI(user) || isrobot(user))
 		return 1
@@ -904,7 +904,7 @@
 		return !locked
 
 /obj/machinery/power/apc/proc/is_locked(mob/user as mob)
-	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
+	if(user.can_admin_interact())
 		return 0
 	if(isAI(user) || isrobot(user))
 		return 0

code/modules/shuttle/supply.dm

@@ -631,11 +631,11 @@
 	data["can_launch"] = !shuttle_master.supply.canMove()
 	return data
 
-/obj/machinery/computer/supplycomp/proc/is_authorized(user)
+/obj/machinery/computer/supplycomp/proc/is_authorized(mob/user)
 	if(allowed(user))
 		return 1
 
-	if(isobserver(user) && check_rights(R_ADMIN, 0))
+	if(user.can_admin_interact())
 		return 1
 
 	return 0