merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-06 13:09:20 +10:00
parent dc3f6f2239
commit ad75e6b352
17 changed files with 230 additions and 48 deletions

View File

@@ -56,7 +56,7 @@
////////////
var/next_allowed_topic_time = 10
// comment out the line below when debugging locally to enable the options & messages menu
//control_freak = 1
control_freak = 1

View File

@@ -121,7 +121,7 @@
admin_memo_show()
//log_client_to_db()
log_client_to_db()
//////////////