cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4117 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2012-07-19 18:25:03 +00:00
parent 1ce01f34b9
commit dea387876d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/machinery/telecomms/telemonitor.dm
View File

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