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

512 forward compatibility merge

Browse Source
This commit is contained in:
Jordan Brown
2017-10-29 10:28:36 -05:00
committed by CitadelStationBot
parent fd2705b6e6
commit 4b297f509e
227 changed files with 5060 additions and 2003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_investigate.dm
+4
View File
@@ -2,7 +2,11 @@
if(!message || !subject)
return
var/F = file("[GLOB.log_directory]/[subject].html")
<<<<<<< HEAD
F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
=======
WRITE_FILE(F, "<small>[time_stamp()] [REF(src)] ([x],[y],[z])</small> || [src] [message]<br>")
>>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental
/client/proc/investigate_show(subject in list("hrefs","notes, memos, watchlist", INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS) )