mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
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:
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
|
||||
admin_memo_show()
|
||||
|
||||
//log_client_to_db()
|
||||
log_client_to_db()
|
||||
|
||||
|
||||
//////////////
|
||||
|
||||
Reference in New Issue
Block a user