Merge branch 'master' of https://github.com/tgstation/-tg-station into fromanicperspectivethesqldbislikeadivinespacecensus

Conflicts:
	code/modules/admin/topic.dm
This commit is contained in:
Jordie0608
2015-08-30 22:55:53 +10:00
130 changed files with 1497 additions and 523 deletions
+2 -1
View File
@@ -148,7 +148,8 @@
var/search
output += "<center><a href='?_src_=holder;addnoteempty=1'>\[Add Note\]</a></center>"
output += ruler
index = sanitizeSQL(index)
if(!isnum(index))
index = sanitizeSQL(index)
switch(index)
if(1)
search = "^."