From d372db14f3a2cf32d964e549e819a74db6d8b4eb Mon Sep 17 00:00:00 2001 From: Mloc Date: Sun, 4 Mar 2012 16:26:42 +0000 Subject: [PATCH] Fix for telecoms and cameras. Signed-off-by: Mloc --- code/game/machinery/camera.dm | 2 +- code/game/machinery/telecomms/telecommunications.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm index fdb8fb7c23a..b980e24c108 100644 --- a/code/game/machinery/camera.dm +++ b/code/game/machinery/camera.dm @@ -212,12 +212,12 @@ L.Add(C) camera_sort(L) + L = camera_network_sort(L) var/list/D = list() for (var/obj/machinery/camera/C in L) if ( C.network in src.networks ) D[text("[]: [][]", C.network, C.c_tag, (C.status ? null : " (Deactivated)"))] = C - D = camera_network_sort(D) D["Cancel"] = "Cancel" var/t = input(user, "Which camera should you change to?") as null|anything in D diff --git a/code/game/machinery/telecomms/telecommunications.dm b/code/game/machinery/telecomms/telecommunications.dm index a84aff8bede..6e9d41ea4d8 100644 --- a/code/game/machinery/telecomms/telecommunications.dm +++ b/code/game/machinery/telecomms/telecommunications.dm @@ -393,6 +393,8 @@ var/datum/comm_log_entry/log = new var/mob/M = signal.data["mob"] + if(istype(M, /mob/new_player)) + return //Kludgy fix, will route out the real cause later --mloc // Copy the signal.data entries we want log.parameters["mobtype"] = signal.data["mobtype"]