cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

More work on NTSL and world/Topic()

Browse Source 
Includes a plethora of new NTSL functions, courtesy of Donkieyo (thread: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8153)


Bugfix for a weird runtime generated when an AI tries to interact with telecomms machinery directly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3347 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2012-03-23 19:59:00 +00:00
parent fc83354e02
commit 6a8a665132
4 changed files with 167 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/machine_interactions.dm
+22 -14
View File
@@ -106,7 +106,9 @@
if(stat & (BROKEN|NOPOWER) || !on)
return
var/obj/item/device/multitool/P = user.equipped()
var/obj/item/device/multitool/P = null
if(!issilicon(user))
P = user.equipped()
user.machine = src
var/dat
@@ -142,10 +144,12 @@
dat += "<br> <a href='?src=\ref[src];input=freq'>\[Add Filter\]</a>"
dat += "<hr>"
if(P.buffer)
dat += "<br><br>MULTITOOL BUFFER: [P.buffer] ([P.buffer.id]) <a href='?src=\ref[src];link=1'>\[Link\]</a> <a href='?src=\ref[src];flush=1'>\[Flush\]"
else
dat += "<br><br>MULTITOOL BUFFER: <a href='?src=\ref[src];buffer=1'>\[Add Machine\]</a>"
if(P)
if(P.buffer)
dat += "<br><br>MULTITOOL BUFFER: [P.buffer] ([P.buffer.id]) <a href='?src=\ref[src];link=1'>\[Link\]</a> <a href='?src=\ref[src];flush=1'>\[Flush\]"
else
dat += "<br><br>MULTITOOL BUFFER: <a href='?src=\ref[src];buffer=1'>\[Add Machine\]</a>"
dat += "</font>"
temp = ""
@@ -164,7 +168,9 @@
if(stat & (BROKEN|NOPOWER) || !on)
return
var/obj/item/device/multitool/P = usr.equipped()
var/obj/item/device/multitool/P = null
if(!issilicon(usr))
P = usr.equipped()
if(href_list["input"])
switch(href_list["input"])
@@ -220,17 +226,19 @@
if(href_list["link"])
if(P.buffer)
if(!(src in P.buffer.links))
P.buffer.links.Add(src)
if(P)
if(!(P.buffer in src.links))
src.links.Add(P.buffer)
if(P.buffer)
if(!(src in P.buffer.links))
P.buffer.links.Add(src)
temp = "<font color = #666633>-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-</font color>"
if(!(P.buffer in src.links))
src.links.Add(P.buffer)
else
temp = "<font color = #666633>-% Unable to acquire buffer %-</font color>"
temp = "<font color = #666633>-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-</font color>"
else
temp = "<font color = #666633>-% Unable to acquire buffer %-</font color>"
if(href_list["buffer"])
code/game/topic.dm
+13 -1
View File
@@ -25,9 +25,21 @@
s["host"] = host ? host : null
s["players"] = list()
var/n = 0
var/admins = 0
for(var/mob/M in world)
if(M.client)
if(M.client.holder && M.client.authenticated)
if(!M.client.stealth)
admins++
s["player[n]"] = M.client.key
n++
s["players"] = n
return list2params(s)
// 7 + s["players"] + 1 = index of s["revinfo"]
s["revision"] = revdata.revision
s["admins"] = admins
return list2params(s)