From dea387876dc74593bd1824aacf184b7d0bee3c44 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Thu, 19 Jul 2012 18:25:03 +0000 Subject: [PATCH] A few more fixes to Telecomms. For some reason some of the machines were STILL using the global list/machines variable. This should hopefully stop telecomms from fucking over the Master Controller's machinery subroutine. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4117 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/telecomms/telemonitor.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 8aa9590c65..378bd6daf8 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -33,9 +33,9 @@ if(0) dat += "
[temp]

" dat += "
Current Network: [network]
" - if(machines.len) + if(machinelist.len) dat += "
Detected Network Entities:" dat += "
\[Flush Buffer\]" @@ -74,7 +74,7 @@ if(href_list["viewmachine"]) screen = 1 - for(var/obj/machinery/telecomms/T in machines) + for(var/obj/machinery/telecomms/T in machinelist) if(T.id == href_list["viewmachine"]) SelectedMachine = T break @@ -83,25 +83,25 @@ switch(href_list["operation"]) if("release") - machines = list() + machinelist = list() screen = 0 if("mainmenu") screen = 0 if("probe") - if(machines.len > 0) + if(machinelist.len > 0) temp = "- FAILED: CANNOT PROBE WHEN BUFFER FULL -" else for(var/obj/machinery/telecomms/T in range(25, src)) if(T.network == network) - machines.Add(T) + machinelist.Add(T) - if(!machines.len) + if(!machinelist.len) temp = "- FAILED: UNABLE TO LOCATE NETWORK ENTITIES IN \[[network]\] -" else - temp = "- [machines.len] ENTITIES LOCATED & BUFFERED -" + temp = "- [machinelist.len] ENTITIES LOCATED & BUFFERED -" screen = 0