shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-32504

Browse Source
This commit is contained in:
LetterJay
2017-11-12 23:11:53 -06:00
committed by GitHub
parent b0439afd08 3ea8808201
commit 7e6283a3f0
599 changed files with 15855 additions and 19219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/camera/camera.dm
+1 -1
View File
@@ -203,7 +203,7 @@
if(U.name == "Unknown")
to_chat(AI, "<b>[U]</b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
else
to_chat(AI, "<b><a href='?src=\ref[AI];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
to_chat(AI, "<b><a href='?src=[REF(AI)];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
AI.last_paper_seen = "<HTML><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
else if (O.client && O.client.eye == src)
to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
code/game/machinery/camera/motion.dm
+1
View File
@@ -70,3 +70,4 @@
if (!area_motion)
if(isliving(AM))
newTarget(AM)